From ea1d3f9b7025142d6ba1a8bef4e21bc58fbacebb Mon Sep 17 00:00:00 2001
From: Robin Lee <rgl@google.com>
Date: Tue, 4 Feb 2020 23:39:55 +0100
Subject: Move TvProvision from system_ext to product

Test: find $OUT -name TvProvision
BUG: 148693734
Change-Id: Id610dcbc2904cae3fb3f1145f6fde9f3dec8ae2a
---
 TvProvision/Android.bp                                        | 6 +++---
 TvProvision/src/com/android/tv/provision/DefaultActivity.java | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'TvProvision')

diff --git a/TvProvision/Android.bp b/TvProvision/Android.bp
index 71e0ee9..ed00008 100644
--- a/TvProvision/Android.bp
+++ b/TvProvision/Android.bp
@@ -1,6 +1,6 @@
 prebuilt_etc {
     name: "privapp_whitelist_com.android.tv.provision",
-    system_ext_specific: true,
+    product_specific: true,
     sub_dir: "permissions",
     src: "com.android.tv.provision.xml",
     filename_from_src: true,
@@ -9,8 +9,8 @@ prebuilt_etc {
 android_app {
     name: "TvProvision",
     srcs: ["**/*.java"],
-    platform_apis: true,
-    system_ext_specific: true,
+    product_specific: true,
+    sdk_version: "system_current",
     certificate: "platform",
     privileged: true,
     overrides: ["SdkSetup"],
diff --git a/TvProvision/src/com/android/tv/provision/DefaultActivity.java b/TvProvision/src/com/android/tv/provision/DefaultActivity.java
index 97a7ff9..0a7debf 100644
--- a/TvProvision/src/com/android/tv/provision/DefaultActivity.java
+++ b/TvProvision/src/com/android/tv/provision/DefaultActivity.java
@@ -20,7 +20,6 @@ import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.content.pm.UserInfo;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -31,6 +30,8 @@ import android.provider.Settings;
  */
 public class DefaultActivity extends Activity {
 
+    private static final String TV_USER_SETUP_COMPLETE = "tv_user_setup_complete";
+
     @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -40,7 +41,7 @@ public class DefaultActivity extends Activity {
             Settings.Global.putInt(getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 1);
         }
         Settings.Secure.putInt(getContentResolver(), Settings.Secure.USER_SETUP_COMPLETE, 1);
-        Settings.Secure.putInt(getContentResolver(), Settings.Secure.TV_USER_SETUP_COMPLETE, 1);
+        Settings.Secure.putInt(getContentResolver(), TV_USER_SETUP_COMPLETE, 1);
 
         // remove this activity from the package manager.
         PackageManager pm = getPackageManager();
@@ -54,8 +55,7 @@ public class DefaultActivity extends Activity {
 
     private boolean isRestrictedUser() {
         UserManager userManager = (UserManager) getSystemService(Context.USER_SERVICE);
-        UserInfo userInfo = userManager.getUserInfo(UserHandle.myUserId());
-        return userInfo.isRestricted();
+        return userManager.isRestrictedProfile();
     }
 }
 
-- 
cgit v1.2.3