Update android_media_AudioSystem.cpp

cmds/bootanimation/BootAnimation.cpp

@@ -73,6 +73,7 @@
 #define OEM_SHUTDOWN_ANIMATION_FILE "/oem/media/shutdownanimation.zip"
 #define SYSTEM_SHUTDOWN_ANIMATION_FILE "/system/media/shutdownanimation.zip"
 #define SYSTEM_ENCRYPTED_SHUTDOWN_ANIMATION_FILE "/system/media/shutdownanimation-encrypted.zip"
+#define THEME_SHUTDOWN_ANIMATION_FILE "/data/system/theme/shutdownanimation.zip"
 
 #define OEM_BOOT_MUSIC_FILE "/oem/media/boot.wav"
 #define SYSTEM_BOOT_MUSIC_FILE "/system/media/boot.wav"
@@ -408,14 +409,9 @@ status_t BootAnimation::readyToRun() {
             (access(getAnimationFileName(IMG_ENC), R_OK) == 0) &&
             ((zipFile = ZipFileRO::open(getAnimationFileName(IMG_ENC))) != NULL)) ||
 
-            ((access(THEME_BOOTANIMATION_FILE, R_OK) == 0) &&
-            ((zipFile = ZipFileRO::open(THEME_BOOTANIMATION_FILE)) != NULL)) ||
+            ((access(getAnimationFileName(IMG_THM), R_OK) == 0) &&
+            ((zipFile = ZipFileRO::open(getAnimationFileName(IMG_THM))) != NULL)) ||
 
-            ((access(OEM_BOOTANIMATION_FILE, R_OK) == 0) &&
-            ((zipFile = ZipFileRO::open(OEM_BOOTANIMATION_FILE)) != NULL)) ||
-
-            ((access(SYSTEM_BOOTANIMATION_FILE, R_OK) == 0) &&
-            ((zipFile = ZipFileRO::open(SYSTEM_BOOTANIMATION_FILE)) != NULL)) ||
 
             ((access(getAnimationFileName(IMG_DATA), R_OK) == 0) &&
             ((zipFile = ZipFileRO::open(getAnimationFileName(IMG_DATA))) != NULL)) ||
@@ -888,12 +884,14 @@ bool BootAnimation::movie()
 
 const char *BootAnimation::getAnimationFileName(ImageID image)
 {
-    const char *fileName[2][3] = { { OEM_BOOTANIMATION_FILE,
+    const char *fileName[2][4] = { { OEM_BOOTANIMATION_FILE,
             SYSTEM_BOOTANIMATION_FILE,
-            SYSTEM_ENCRYPTED_BOOTANIMATION_FILE }, {
+            SYSTEM_ENCRYPTED_BOOTANIMATION_FILE,
+            THEME_BOOTANIMATION_FILE }, {
             OEM_SHUTDOWN_ANIMATION_FILE,
             SYSTEM_SHUTDOWN_ANIMATION_FILE,
-            SYSTEM_ENCRYPTED_SHUTDOWN_ANIMATION_FILE} };
+            SYSTEM_ENCRYPTED_SHUTDOWN_ANIMATION_FILE,
+            THEME_SHUTDOWN_ANIMATION_FILE} };
     int state;
     char sku[PROPERTY_VALUE_MAX];
     char skusuffix[PATH_MAX];

cmds/bootanimation/BootAnimation.h

@@ -93,7 +93,7 @@ class BootAnimation : public Thread, public IBinder::DeathRecipient
     bool readFile(const char* name, String8& outString);
     bool movie();
 
-    enum ImageID { IMG_DATA = 0, IMG_SYS = 1, IMG_ENC = 2 };
+    enum ImageID { IMG_DATA = 0, IMG_SYS = 1, IMG_ENC = 2, IMG_THM = 3 };
     const char *getAnimationFileName(ImageID image);
     const char *getBootRingtoneFileName(ImageID image);
     void playBackgroundMusic();

core/java/android/app/ApplicationPackageManager.java

@@ -2048,9 +2048,11 @@ public void setComponentProtectedSetting(ComponentName componentName, boolean ne
 
     /** @hide */
     @Override
-    public boolean isComponentProtected(String callingPackage, ComponentName componentName) {
+    public boolean isComponentProtected(String callingPackage, int callingUid,
+            ComponentName componentName) {
         try {
-            return mPM.isComponentProtected(callingPackage, componentName, mContext.getUserId());
+            return mPM.isComponentProtected(callingPackage, callingUid, componentName,
+                    mContext.getUserId());
         } catch (RemoteException re) {
             Log.e(TAG, "Failed to get component protected setting", re);
             return false;

core/java/android/app/ContextImpl.java

@@ -2018,6 +2018,11 @@ private File[] ensureDirsExistOrFilter(File[] dirs) {
             }
             result.add(dir);
         }
+
+        // Make sure there is at least one element, let the callers handle that
+        if (result.size() == 0) {
+            result.add(null);
+        }
         return result.toArray(new File[result.size()]);
     }
 

core/java/android/app/INotificationManager.aidl

@@ -55,6 +55,9 @@ interface INotificationManager
     void setPackageVisibilityOverride(String pkg, int uid, int visibility);
     int getPackageVisibilityOverride(String pkg, int uid);
 
+    void setShowNotificationForPackageOnKeyguard(String pkg, int uid, int status);
+    int getShowNotificationForPackageOnKeyguard(String pkg, int uid);
+
     // TODO: Remove this when callers have been migrated to the equivalent
     // INotificationListener method.
     StatusBarNotification[] getActiveNotifications(String callingPkg);

core/java/android/app/Notification.java

@@ -522,6 +522,21 @@ public class Notification implements Parcelable
     @Priority
     public int priority;
 
+    /**
+     * Default.
+     * Show all notifications from an app on keyguard.
+     *
+     * @hide
+     */
+    public static final int SHOW_ALL_NOTI_ON_KEYGUARD = 0x01;
+
+    /**
+     * Show only notifications from an app which are not ongoing ones.
+     *
+     * @hide
+     */
+    public static final int SHOW_NO_ONGOING_NOTI_ON_KEYGUARD = 0x02;
+
     /**
      * Accent color (an ARGB integer like the constants in {@link android.graphics.Color})
      * to be applied by the standard Style templates when presenting this notification.

core/java/android/app/NotificationManager.java

@@ -19,6 +19,7 @@
 import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.annotation.SdkConstant;
+import android.app.Notification;
 import android.app.Notification.Builder;
 import android.content.ComponentName;
 import android.content.Context;
@@ -512,6 +513,16 @@ public ArraySet<String> getPackagesRequestingNotificationPolicyAccess() {
         return new ArraySet<String>();
     }
 
+    /** @hide */
+    public int getShowNotificationForPackageOnKeyguard(String pkg, int uid) {
+        INotificationManager service = getService();
+        try {
+            return getService().getShowNotificationForPackageOnKeyguard(pkg, uid);
+        } catch (RemoteException e) {
+            return Notification.SHOW_ALL_NOTI_ON_KEYGUARD;
+        }
+    }
+
     private Context mContext;
 
     private static void checkRequired(String name, Object value) {

core/java/android/app/ResourcesManager.java

@@ -576,6 +576,7 @@ private boolean attachThemeAssets(AssetManager assets, ThemeConfig theme) {
         PackageInfo piTheme = null;
         PackageInfo piTarget = null;
         PackageInfo piAndroid = null;
+        PackageInfo piCm = null;
 
         // Some apps run in process of another app (eg keyguard/systemUI) so we must get the
         // package name from the res tables. The 0th base package name will be the android group.
@@ -609,16 +610,20 @@ private boolean attachThemeAssets(AssetManager assets, ThemeConfig theme) {
             }
             piAndroid = getPackageManager().getPackageInfo("android", 0,
                     UserHandle.getCallingUserId());
+            piCm = getPackageManager().getPackageInfo("cyanogenmod.platform", 0,
+                    UserHandle.getCallingUserId());
         } catch (RemoteException e) {
         }
 
         if (piTheme == null || piTheme.applicationInfo == null ||
                     piTarget == null || piTarget.applicationInfo == null ||
                     piAndroid == null || piAndroid.applicationInfo == null ||
+                    piCm == null || piCm.applicationInfo == null ||
                     piTheme.mOverlayTargets == null) {
             return false;
         }
 
+        // Attach themed resources for target
         String themePackageName = piTheme.packageName;
         String themePath = piTheme.applicationInfo.publicSourceDir;
         if (!piTarget.isThemeApk && piTheme.mOverlayTargets.contains(basePackageName)) {
@@ -638,6 +643,24 @@ private boolean attachThemeAssets(AssetManager assets, ThemeConfig theme) {
             }
         }
 
+        // Attach themed resources for cmsdk
+        if (!piTarget.isThemeApk && !piCm.packageName.equals(basePackageName) &&
+                piTheme.mOverlayTargets.contains(piCm.packageName)) {
+            String resCachePath= ThemeUtils.getTargetCacheDir(piCm.packageName,
+                    piTheme.packageName);
+            String prefixPath = ThemeUtils.getOverlayPathToTarget(piCm.packageName);
+            String targetPackagePath = piCm.applicationInfo.publicSourceDir;
+            String resApkPath = resCachePath + "/resources.apk";
+            String idmapPath = ThemeUtils.getIdmapPath(piCm.packageName, piTheme.packageName);
+            int cookie = assets.addOverlayPath(idmapPath, themePath,
+                    resApkPath, targetPackagePath, prefixPath);
+            if (cookie != 0) {
+                assets.setThemePackageName(themePackageName);
+                assets.addThemeCookie(cookie);
+            }
+        }
+
+        // Attach themed resources for android framework
         if (!piTarget.isThemeApk && !"android".equals(basePackageName) &&
                 piTheme.mOverlayTargets.contains("android")) {
             String resCachePath= ThemeUtils.getTargetCacheDir(piAndroid.packageName,

core/java/android/content/pm/IPackageManager.aidl

@@ -521,6 +521,6 @@ interface IPackageManager {
     int processThemeResources(String themePkgName);
 
     /** Protected Apps */
-    boolean isComponentProtected(in String callingPackage, in ComponentName componentName,
-            int userId);
+    boolean isComponentProtected(in String callingPackage, in int callingUid,
+    in ComponentName componentName, int userId);
 }

core/java/android/content/pm/PackageManager.java

@@ -4564,7 +4564,7 @@ public void onCreated(int moveId, Bundle extras) {}
      * Return whether or not a specific component is protected
      * @hide
      */
-    public abstract boolean isComponentProtected(String callingPackage,
+    public abstract boolean isComponentProtected(String callingPackage, int callingUid,
             ComponentName componentName);
 
     /**

core/java/android/content/res/Resources.java

@@ -120,6 +120,8 @@ public class Resources {
     public static final int THEME_APP_PKG_ID = 0x61;
     /** @hide */
     public static final int THEME_ICON_PKG_ID = 0x62;
+    /** @hide */
+    public static final int THEME_CM_PKG_ID = 0x63;
     /**
      * The common resource pkg id needs to be less than the THEME_FRAMEWORK_PKG_ID
      * otherwise aapt will complain and fail

core/java/android/nfc/INfcAdapter.aidl

@@ -1,4 +1,7 @@
 /*
+ * Copyright (c) 2015, The Linux Foundation. All rights reserved.
+ * Not a Contribution.
+ *
  * Copyright (C) 2010 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,6 +31,7 @@ import android.nfc.INfcTag;
 import android.nfc.INfcCardEmulation;
 import android.nfc.INfcUnlockHandler;
 import android.os.Bundle;
+import android.os.IBinder;
 
 /**
  * @hide
@@ -37,6 +41,7 @@ interface INfcAdapter
     INfcTag getNfcTagInterface();
     INfcCardEmulation getNfcCardEmulationInterface();
     INfcAdapterExtras getNfcAdapterExtrasInterface(in String pkg);
+    IBinder getNfcAdapterVendorInterface(in String vendor);
 
     int getState();
     boolean disable(boolean saveState);

core/java/android/nfc/cardemulation/AidGroup.java

@@ -1,6 +1,9 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
  *
+ * Copyright (c) 2015, The Linux Foundation. All rights reserved.
+ * Not a Contribution.
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -37,17 +40,17 @@
  *
  * @hide
  */
-public final class AidGroup implements Parcelable {
+public class AidGroup implements Parcelable {
     /**
      * The maximum number of AIDs that can be present in any one group.
      */
     public static final int MAX_NUM_AIDS = 256;
 
     static final String TAG = "AidGroup";
 
-    final List<String> aids;
-    final String category;
-    final String description;
+    protected List<String> aids;
+    protected String category;
+    protected String description;
 
     /**
      * Creates a new AidGroup object.

core/java/android/nfc/tech/MifareClassic.java

@@ -1,4 +1,6 @@
 /*
+ * Copyright (C) 2015 NXP Semiconductors
+ * The original Work has been changed by NXP Semiconductors.
  * Copyright (C) 2010 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -173,6 +175,10 @@ public MifareClassic(Tag tag) throws RemoteException {
             mType = TYPE_CLASSIC;
             mSize = SIZE_4K;
             break;
+        case 0x19:
+            mType = TYPE_CLASSIC;
+            mSize = SIZE_2K;
+            break;
         case 0x28:
             mType = TYPE_CLASSIC;
             mSize = SIZE_1K;

core/java/android/nfc/tech/NfcA.java

@@ -1,4 +1,6 @@
 /*
+ * Copyright (C) 2015 NXP Semiconductors
+ * The original Work has been changed by NXP Semiconductors.
  * Copyright (C) 2010 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -66,8 +68,15 @@ public static NfcA get(Tag tag) {
     /** @hide */
     public NfcA(Tag tag) throws RemoteException {
         super(tag, TagTechnology.NFC_A);
-        Bundle extras = tag.getTechExtras(TagTechnology.NFC_A);
-        mSak = extras.getShort(EXTRA_SAK);
+        Bundle extras;
+        mSak = 0;
+        if(tag.hasTech(TagTechnology.MIFARE_CLASSIC))
+        {
+            extras = tag.getTechExtras(TagTechnology.MIFARE_CLASSIC);
+            mSak = extras.getShort(EXTRA_SAK);
+        }
+        extras = tag.getTechExtras(TagTechnology.NFC_A);
+        mSak |= extras.getShort(EXTRA_SAK);
         mAtqa = extras.getByteArray(EXTRA_ATQA);
     }
 

core/java/android/os/RecoverySystem.java

@@ -335,22 +335,27 @@ public static void installPackage(Context context, File packageFile)
         throws IOException {
         String filename = packageFile.getCanonicalPath();
 
-        FileWriter uncryptFile = new FileWriter(UNCRYPT_FILE);
-        try {
-            uncryptFile.write(filename + "\n");
-        } finally {
-            uncryptFile.close();
-        }
-        // UNCRYPT_FILE needs to be readable by system server on bootup.
-        if (!UNCRYPT_FILE.setReadable(true, false)) {
-            Log.e(TAG, "Error setting readable for " + UNCRYPT_FILE.getCanonicalPath());
-        }
-        Log.w(TAG, "!!! REBOOTING TO INSTALL " + filename + " !!!");
+        final String cryptoStatus = SystemProperties.get("ro.crypto.state", "unsupported");
+        final boolean isEncrypted = "encrypted".equalsIgnoreCase(cryptoStatus);
 
-        // If the package is on the /data partition, write the block map file
-        // into COMMAND_FILE instead.
-        if (filename.startsWith("/data/")) {
-            filename = "@/cache/recovery/block.map";
+        if (isEncrypted) {
+            FileWriter uncryptFile = new FileWriter(UNCRYPT_FILE);
+            try {
+                uncryptFile.write(filename + "\n");
+            } finally {
+                uncryptFile.close();
+            }
+            // UNCRYPT_FILE needs to be readable by system server on bootup.
+            if (!UNCRYPT_FILE.setReadable(true, false)) {
+                Log.e(TAG, "Error setting readable for " + UNCRYPT_FILE.getCanonicalPath());
+            }
+            Log.w(TAG, "!!! REBOOTING TO INSTALL " + filename + " !!!");
+
+            // If the package is on the /data partition, write the block map file
+            // into COMMAND_FILE instead.
+            if (filename.startsWith("/data/")) {
+                filename = "@/cache/recovery/block.map";
+            }
         }
 
         final String filenameArg = "--update_package=" + filename;

core/java/android/preference/SeekBarVolumizer.java

@@ -412,10 +412,11 @@ public void onReceive(Context context, Intent intent) {
                 int streamValue = intent.getIntExtra(AudioManager.EXTRA_VOLUME_STREAM_VALUE, -1);
                 updateVolumeSlider(streamType, streamValue);
             } else if (AudioManager.INTERNAL_RINGER_MODE_CHANGED_ACTION.equals(action)) {
+                final int oldRingerMode = mRingerMode;
                 if (mNotificationOrRing) {
                     mRingerMode = mAudioManager.getRingerModeInternal();
                 }
-                if (mAffectedByRingerMode) {
+                if (mAffectedByRingerMode && oldRingerMode != mRingerMode) {
                     updateSlider();
                 }
             } else if (AudioManager.STREAM_DEVICES_CHANGED_ACTION.equals(action)) {

core/java/android/provider/Settings.java

@@ -1509,7 +1509,6 @@ public static interface Validator {
             // At one time in System, then Global, but now back in Secure
             MOVED_TO_SECURE.add(Secure.INSTALL_NON_MARKET_APPS);
 
-            MOVED_TO_SECURE.add(System.DEV_FORCE_SHOW_NAVBAR);
             MOVED_TO_SECURE.add(System.KEYBOARD_BRIGHTNESS);
             MOVED_TO_SECURE.add(System.BUTTON_BRIGHTNESS);
             MOVED_TO_SECURE.add(System.BUTTON_BACKLIGHT_TIMEOUT);