Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b042f08d authored by David Ng's avatar David Ng
Browse files

Merge tag 'android-6.0.0_r26' into HEAD 

Android 6.0.0 release 26

* tag 'android-6.0.0_r26': (396 commits)
  MediaActionSound: Fix video stop sound
  ZenModeHelper: fix cross deadlock with AudioService
  Ensure SurfaceView requests WM relayout when size changes.
  Camera: fix wrong FULL feature string
  Fix AudioService rotation helper thread
  Add anydpi to the providing-resources docs
  ZenModeHelper: fix cross deadlock with AudioService
  Import translations. DO NOT MERGE
  AudioService: alternative way of handling device rotation
  Send POWER_HINT_INTERACTION on rotate.
  Add minimum time for double tap gesture
  Import translations. DO NOT MERGE
  Camera2: Update video stabilization API doc.
  Relax auto-launch checks for GET_CONTENT.
  Ambient display now comes up immediately when a notification comes in
  Fix jank: Don't write lockout deadline if not needed
  Bump BatteryStats version
  Fix jank: Don't write lockout deadline if not needed
  Fix asymmetry in parceling/unparceling code for BatteryStats summary
  Bump BatteryStats version
  ...

Conflicts:
	core/java/android/accounts/AccountManager.java
	core/java/android/nfc/cardemulation/AidGroup.java
	core/java/android/os/storage/IMountService.java
	core/java/com/android/internal/widget/ILockSettings.aidl
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml
	packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
	services/core/java/com/android/server/LocationManagerService.java
	telecomm/java/android/telecom/Phone.java
	telephony/java/android/telephony/CarrierConfigManager.java
	telephony/java/android/telephony/RadioAccessFamily.java
	telephony/java/android/telephony/ServiceState.java
	telephony/java/android/telephony/SignalStrength.java
	telephony/java/android/telephony/TelephonyManager.java
	telephony/java/com/android/ims/ImsCallProfile.java
	telephony/java/com/android/ims/ImsReasonInfo.java
	telephony/java/com/android/ims/ImsSuppServiceNotification.aidl
	telephony/java/com/android/ims/ImsSuppServiceNotification.java
	telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl
	telephony/java/com/android/internal/telephony/RILConstants.java

Change-Id: I28b74b38b338800a3bc8054999f95307ae66b505
parents 18638b01 25b5096f

Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/app/IWallpaperManager.aidl \

	core/java/android/app/IWallpaperManagerCallback.aidl \

	core/java/android/app/admin/IDevicePolicyManager.aidl \

	core/java/android/app/trust/IStrongAuthTracker.aidl \

	core/java/android/app/trust/ITrustManager.aidl \

	core/java/android/app/trust/ITrustListener.aidl \

	core/java/android/app/backup/IBackupManager.aidl \
@@ -161,6 +162,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/hardware/fingerprint/IFingerprintDaemon.aidl \

	core/java/android/hardware/fingerprint/IFingerprintDaemonCallback.aidl \

	core/java/android/hardware/fingerprint/IFingerprintService.aidl \

	core/java/android/hardware/fingerprint/IFingerprintServiceLockoutResetCallback.aidl \

	core/java/android/hardware/fingerprint/IFingerprintServiceReceiver.aidl \

	core/java/android/hardware/hdmi/IHdmiControlCallback.aidl \

	core/java/android/hardware/hdmi/IHdmiControlService.aidl \
@@ -173,7 +175,9 @@ LOCAL_SRC_FILES += \ 
	core/java/android/hardware/hdmi/IHdmiVendorCommandListener.aidl \

	core/java/android/hardware/input/IInputManager.aidl \

	core/java/android/hardware/input/IInputDevicesChangedListener.aidl \

	core/java/android/hardware/input/ITabletModeChangedListener.aidl \

	core/java/android/hardware/location/IActivityRecognitionHardware.aidl \

	core/java/android/hardware/location/IActivityRecognitionHardwareClient.aidl \

	core/java/android/hardware/location/IActivityRecognitionHardwareSink.aidl \

	core/java/android/hardware/location/IActivityRecognitionHardwareWatcher.aidl \

	core/java/android/hardware/location/IFusedLocationHardware.aidl \

cmds/bootanimation/BootAnimation.cpp

+0 −5
Original line number Diff line number Diff line
@@ -566,15 +566,10 @@ bool BootAnimation::movie() 


    mZip->endIteration(cookie);



    // clear screen

    glShadeModel(GL_FLAT);

    glDisable(GL_DITHER);

    glDisable(GL_SCISSOR_TEST);

    glDisable(GL_BLEND);

    glClearColor(0,0,0,1);

    glClear(GL_COLOR_BUFFER_BIT);



    eglSwapBuffers(mDisplay, mSurface);



    glBindTexture(GL_TEXTURE_2D, 0);

    glEnable(GL_TEXTURE_2D);

cmds/svc/src/com/android/commands/svc/NfcCommand.java

0 → 100644
+85 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2015 The Android Open Source Project

 *

 * 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

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.commands.svc;



import android.content.Context;

import android.content.pm.IPackageManager;

import android.content.pm.PackageManager;

import android.nfc.INfcAdapter;

import android.os.RemoteException;

import android.os.ServiceManager;



public class NfcCommand extends Svc.Command {



    public NfcCommand() {

        super("nfc");

    }



    @Override

    public String shortHelp() {

        return "Control NFC functions";

    }



    @Override

    public String longHelp() {

        return shortHelp() + "\n"

                + "\n"

                + "usage: svc nfc [enable|disable]\n"

                + "         Turn NFC on or off.\n\n";

    }



    @Override

    public void run(String[] args) {

        boolean validCommand = false;

        if (args.length >= 2) {

            boolean flag = false;

            if ("enable".equals(args[1])) {

                flag = true;

                validCommand = true;

            } else if ("disable".equals(args[1])) {

                flag = false;

                validCommand = true;

            }

            if (validCommand) {

                IPackageManager pm = IPackageManager.Stub.asInterface(

                        ServiceManager.getService("package"));

                try {

                    if (pm.hasSystemFeature(PackageManager.FEATURE_NFC)) {

                        INfcAdapter nfc = INfcAdapter.Stub

                                .asInterface(ServiceManager.getService(Context.NFC_SERVICE));

                        try {

                            if (flag) {

                                nfc.enable();

                            } else

                                nfc.disable(true);

                        } catch (RemoteException e) {

                            System.err.println("NFC operation failed: " + e);

                        }

                    } else {

                        System.err.println("NFC feature not supported.");

                    }

                } catch (RemoteException e) {

                    System.err.println("RemoteException while calling PackageManager, is the "

                            + "system running?");

                }

                return;

            }

        }

        System.err.println(longHelp());

    }



}

cmds/svc/src/com/android/commands/svc/Svc.java

+2 −1
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ public class Svc { 
            new PowerCommand(),

            new DataCommand(),

            new WifiCommand(),

            new UsbCommand()

            new UsbCommand(),

            new NfcCommand(),

    };

}

core/java/android/app/Fragment.java

+4 −1
Original line number Diff line number Diff line
@@ -460,6 +460,9 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene 
    // If set this fragment is being retained across the current config change.

    boolean mRetaining;



    // If set this fragment's loaders are being retained across the current config change.

    boolean mRetainLoader;



    // If set this fragment has menu items to contribute.

    boolean mHasMenu;
@@ -2401,7 +2404,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene 
                mLoaderManager = mHost.getLoaderManager(mWho, mLoadersStarted, false);

            }

            if (mLoaderManager != null) {

                if (mRetaining) {

                if (mRetainLoader) {

                    mLoaderManager.doRetain();

                } else {

                    mLoaderManager.doStop();