Merge remote-tracking branch 'tr/5.1' into HEAD

Signed-off-by: Team-Radium <[email protected]>

Author: akhilnarang

Android.mk

@@ -159,7 +159,6 @@ LOCAL_SRC_FILES += \
 	core/java/android/hardware/ICameraServiceListener.aidl \
 	core/java/android/hardware/ICamera.aidl \
 	core/java/android/hardware/ICameraClient.aidl \
-	core/java/android/hardware/ICmHardwareService.aidl \
 	core/java/android/hardware/IConsumerIrService.aidl \
 	core/java/android/hardware/IProCameraUser.aidl \
 	core/java/android/hardware/IProCameraCallbacks.aidl \

core/java/android/app/ActivityThread.java

@@ -1668,7 +1668,7 @@ Resources getTopLevelResources(String resDir, String[] splitResDirs, String[] ov
             LoadedApk pkgInfo, Context context, String pkgName) {
         return mResourcesManager.getTopLevelResources(resDir, splitResDirs, overlayDirs, libDirs,
                 displayId, pkgName, overrideConfiguration, pkgInfo.getCompatibilityInfo(), null,
-                context);
+                context, pkgInfo.getApplicationInfo().isThemeable);
     }
 
     /**
@@ -1677,7 +1677,8 @@ Resources getTopLevelResources(String resDir, String[] splitResDirs, String[] ov
     Resources getTopLevelThemedResources(String resDir, int displayId, LoadedApk pkgInfo,
                                          String pkgName, String themePkgName) {
         return mResourcesManager.getTopLevelThemedResources(resDir, displayId, pkgName,
-                themePkgName, pkgInfo.getCompatibilityInfo(), null);
+                themePkgName, pkgInfo.getCompatibilityInfo(), null,
+                pkgInfo.getApplicationInfo().isThemeable);
     }
 
     final Handler getHandler() {

core/java/android/app/ContextImpl.java

@@ -63,7 +63,6 @@
 import android.database.sqlite.SQLiteDatabase.CursorFactory;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
-import android.hardware.CmHardwareManager;
 import android.hardware.ConsumerIrManager;
 import android.hardware.ISerialManager;
 import android.hardware.SerialManager;
@@ -791,11 +790,6 @@ public Object createService(ContextImpl ctx) {
                 final Context outerContext = ctx.getOuterContext();
                 return new TorchManager(outerContext, service);
             }});
-
-        registerService(CMHW_SERVICE, new ServiceFetcher() {
-            public Object createService(ContextImpl ctx) {
-                return new CmHardwareManager(ctx);
-            }});
     }
 
     static ContextImpl getImpl(Context context) {
@@ -2350,9 +2344,10 @@ private ContextImpl(ContextImpl container, ActivityThread mainThread,
                         packageInfo.getOverlayDirs(),
                         packageInfo.getApplicationInfo().sharedLibraryFiles, displayId,
                         packageInfo.getAppDir(), overrideConfiguration, compatInfo, activityToken,
-                        mOuterContext) :
+                        mOuterContext, packageInfo.getApplicationInfo().isThemeable) :
                 mResourcesManager.getTopLevelThemedResources(packageInfo.getResDir(), displayId,
-                        packageInfo.getPackageName(), themePackageName, compatInfo ,activityToken);
+                        packageInfo.getPackageName(), themePackageName, compatInfo, activityToken,
+                        packageInfo.getApplicationInfo().isThemeable);
             }
         }
         mResources = resources;

core/java/android/app/ResourcesManager.java

@@ -174,9 +174,8 @@ public boolean applyCompatConfiguration(int displayDensity,
     public Resources getTopLevelResources(String resDir, String[] splitResDirs,
             String[] overlayDirs, String[] libDirs, int displayId, String packageName,
             Configuration overrideConfiguration, CompatibilityInfo compatInfo, IBinder token,
-            Context context) {
+            Context context, boolean isThemeable) {
         final float scale = compatInfo.applicationScale;
-        final boolean isThemeable = compatInfo.isThemeable;
         final ThemeConfig themeConfig = getThemeConfig();
         ResourcesKey key = new ResourcesKey(resDir, displayId, overrideConfiguration, scale,
                 isThemeable, themeConfig, token);
@@ -205,7 +204,7 @@ public Resources getTopLevelResources(String resDir, String[] splitResDirs,
 
         AssetManager assets = new AssetManager();
         assets.setAppName(packageName);
-        assets.setThemeSupport(compatInfo.isThemeable);
+        assets.setThemeSupport(isThemeable);
         // resDir can be null if the 'android' package is creating a new Resources object.
         // This is fine, since each AssetManager automatically loads the 'android' package
         // already.
@@ -260,7 +259,7 @@ public Resources getTopLevelResources(String resDir, String[] splitResDirs,
 
         boolean iconsAttached = false;
         /* Attach theme information to the resulting AssetManager when appropriate. */
-        if (compatInfo.isThemeable && config != null && !context.getPackageManager().isSafeMode()) {
+        if (isThemeable && config != null && !context.getPackageManager().isSafeMode()) {
             if (config.themeConfig == null) {
                 try {
                     config.themeConfig = ThemeConfig.getBootTheme(context.getContentResolver());
@@ -311,15 +310,14 @@ public Resources getTopLevelResources(String resDir, String[] splitResDirs,
      *
      * @hide
      */
-    public Resources getTopLevelThemedResources(String resDir, int displayId,
-                                                String packageName,
-                                                String themePackageName,
-                                                CompatibilityInfo compatInfo, IBinder token) {
+    public Resources getTopLevelThemedResources(String resDir, int displayId, String packageName,
+            String themePackageName, CompatibilityInfo compatInfo, IBinder token,
+            boolean isThemeable) {
         Resources r;
 
         AssetManager assets = new AssetManager();
         assets.setAppName(packageName);
-        assets.setThemeSupport(true);
+        assets.setThemeSupport(isThemeable);
         if (assets.addAssetPath(resDir) == 0) {
             return null;
         }
@@ -335,19 +333,21 @@ public Resources getTopLevelThemedResources(String resDir, int displayId,
             config = getConfiguration();
         }
 
-        /* Attach theme information to the resulting AssetManager when appropriate. */
-        ThemeConfig.Builder builder = new ThemeConfig.Builder();
-        builder.defaultOverlay(themePackageName);
-        builder.defaultIcon(themePackageName);
-        builder.defaultFont(themePackageName);
-
-        ThemeConfig themeConfig = builder.build();
-        attachThemeAssets(assets, themeConfig);
-        attachCommonAssets(assets, themeConfig);
-        attachIconAssets(assets, themeConfig);
-
+        boolean iconsAttached = false;
+        if (isThemeable) {
+            /* Attach theme information to the resulting AssetManager when appropriate. */
+            ThemeConfig.Builder builder = new ThemeConfig.Builder();
+            builder.defaultOverlay(themePackageName);
+            builder.defaultIcon(themePackageName);
+            builder.defaultFont(themePackageName);
+
+            ThemeConfig themeConfig = builder.build();
+            attachThemeAssets(assets, themeConfig);
+            attachCommonAssets(assets, themeConfig);
+            iconsAttached = attachIconAssets(assets, themeConfig);
+        }
         r = new Resources(assets, dm, config, compatInfo, token);
-        setActivityIcons(r);
+        if (iconsAttached) setActivityIcons(r);
 
         return r;
     }

core/java/android/bluetooth/BluetoothPan.java

@@ -340,19 +340,25 @@ && isValidDevice(device)) {
 
     public void setBluetoothTethering(boolean value) {
         if (DBG) log("setBluetoothTethering(" + value + ")");
-        try {
-            mPanService.setBluetoothTethering(value);
-        } catch (RemoteException e) {
-            Log.e(TAG, "Stack:" + Log.getStackTraceString(new Throwable()));
+
+        if (mPanService != null && isEnabled()) {
+            try {
+                mPanService.setBluetoothTethering(value);
+            } catch (RemoteException e) {
+                Log.e(TAG, "Stack:" + Log.getStackTraceString(new Throwable()));
+            }
         }
     }
 
     public boolean isTetheringOn() {
         if (VDBG) log("isTetheringOn()");
-        try {
-            return mPanService.isTetheringOn();
-        } catch (RemoteException e) {
-            Log.e(TAG, "Stack:" + Log.getStackTraceString(new Throwable()));
+
+        if (mPanService != null && isEnabled()) {
+            try {
+                return mPanService.isTetheringOn();
+            } catch (RemoteException e) {
+                Log.e(TAG, "Stack:" + Log.getStackTraceString(new Throwable()));
+            }
         }
         return false;
     }

core/java/android/content/Context.java

@@ -2938,17 +2938,6 @@ public abstract boolean startInstrumentation(@NonNull ComponentName className,
      */
     public static final String TORCH_SERVICE = "torch";
 
-    /**
-     * Use with {@link #getSystemService} to retrieve a
-     * {@link android.hardware.CmHardwareManager} for controlling
-     * hw specific features
-     *
-     * @see #getSystemService
-     * @see android.hardware.CmHardwareManager
-     * @hide
-     */
-    public static final String CMHW_SERVICE = "cmhw";
-
     /**
      * {@link com.android.server.KillSwitchService}for accessing the kill switch service.
      *

core/java/android/content/pm/PackageParser.java

@@ -2577,8 +2577,9 @@ private boolean parseBaseApplication(Package owner, Resources res,
         final ApplicationInfo ai = owner.applicationInfo;
         final String pkgName = owner.applicationInfo.packageName;
 
-        // assume that this package is themeable unless explicitly set to false.
-        ai.isThemeable = true;
+        String[] nonThemeablePackages =
+                res.getStringArray(com.android.internal.R.array.non_themeable_packages);
+        ai.isThemeable = isPackageThemeable(pkgName, nonThemeablePackages);
 
         TypedArray sa = res.obtainAttributes(attrs,
                 com.android.internal.R.styleable.AndroidManifestApplication);
@@ -4377,6 +4378,22 @@ private boolean parseIntent(Resources res, XmlPullParser parser, AttributeSet at
         return true;
     }
 
+    /**1
+     * Returns whether the specified package is themeable
+     * @param packageName Name of package to check
+     * @param nonThemeablePackages Array of packages that are declared as non-themeable
+     * @return True if the package is themeable, false otherwise
+     */
+    private static boolean isPackageThemeable(String packageName, String[] nonThemeablePackages) {
+        for (String pkg : nonThemeablePackages) {
+            if (packageName.startsWith(pkg)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     /**
      * Representation of a full package parsed from APK files on disk. A package
      * consists of a single base APK, and zero or more split APKs.

core/java/android/content/res/CompatibilityInfo.java

@@ -92,15 +92,9 @@ public class CompatibilityInfo implements Parcelable {
      */
     public final float applicationInvertedScale;
 
-    /**
-     * Whether the application supports third-party theming.
-     */
-    public final boolean isThemeable;
-
     public CompatibilityInfo(ApplicationInfo appInfo, int screenLayout, int sw,
             boolean forceCompat) {
         int compatFlags = 0;
-        isThemeable = appInfo.isThemeable;
 
         if (appInfo.requiresSmallestWidthDp != 0 || appInfo.compatibleWidthLimitDp != 0
                 || appInfo.largestWidthLimitDp != 0) {
@@ -247,20 +241,17 @@ public CompatibilityInfo(ApplicationInfo appInfo, int screenLayout, int sw,
         mCompatibilityFlags = compatFlags;
     }
 
-    private CompatibilityInfo(int compFlags,
-            int dens, float scale, float invertedScale, boolean isThemeable) {
+    private CompatibilityInfo(int compFlags, int dens, float scale, float invertedScale) {
         mCompatibilityFlags = compFlags;
         applicationDensity = dens;
         applicationScale = scale;
         applicationInvertedScale = invertedScale;
-        this.isThemeable = isThemeable;
     }
 
     private CompatibilityInfo() {
         this(NEVER_NEEDS_COMPAT, DisplayMetrics.DENSITY_DEVICE,
                 1.0f,
-                1.0f,
-                true);
+                1.0f);
     }
 
     /**
@@ -534,7 +525,6 @@ public boolean equals(Object o) {
             if (applicationDensity != oc.applicationDensity) return false;
             if (applicationScale != oc.applicationScale) return false;
             if (applicationInvertedScale != oc.applicationInvertedScale) return false;
-            if (isThemeable != oc.isThemeable) return false;
             return true;
         } catch (ClassCastException e) {
             return false;
@@ -572,7 +562,6 @@ public int hashCode() {
         result = 31 * result + applicationDensity;
         result = 31 * result + Float.floatToIntBits(applicationScale);
         result = 31 * result + Float.floatToIntBits(applicationInvertedScale);
-        result = 31 * result + (isThemeable ? 1 : 0);
         return result;
     }
 
@@ -587,7 +576,6 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeInt(applicationDensity);
         dest.writeFloat(applicationScale);
         dest.writeFloat(applicationInvertedScale);
-        dest.writeInt(isThemeable ? 1 : 0);
     }
 
     public static final Parcelable.Creator<CompatibilityInfo> CREATOR
@@ -608,6 +596,5 @@ private CompatibilityInfo(Parcel source) {
         applicationDensity = source.readInt();
         applicationScale = source.readFloat();
         applicationInvertedScale = source.readFloat();
-        isThemeable = source.readInt() == 1 ? true : false;
     }
 }