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

Commit 9ee42216 authored by Manish Kumar's avatar Manish Kumar
Browse files

Merge commit 'android-4.4.1_r1' into merge_branch 

* commit 'android-4.4.1_r1': (373 commits)
  Stop wifi display discovery when no longer needed.
  Fix issue #11790471: Crash removed home buttons and notification bar/shade
  Revert "PreferenceFragment showing the breadcrumb when not needed."
  Revert "PreferencesFragment showing the breadcrumb area in single pane mode."
  Make action bar media router icons blue again.
  Only scan for wifi display when there is no active connections
  Harden against transiently unavailable backup transports
  Mask OOBE when filtering recent documents.
  Notify apps when insets change.
  Fix incorrent page range parsing when custom print options used.
  Do not hold direct ref BatteryStatsImpl$Uid$Proc
  Use scaled display size in wallpaper constraint.
  Fix NPE in ConnectivityService
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Restore jankless transition keyguard-to-wallpaper
  Add config_restartRadioAfterProvisioning
  Disallow applications from initiating cast screen.
  Import translations. DO NOT MERGE
  ...

Conflicts:
	core/res/res/values/strings.xml
	packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java
	packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java
	packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java
	packages/Keyguard/src/com/android/keyguard/KeyguardTransportControlView.java
	policy/src/com/android/internal/policy/impl/PhoneWindow.java
	services/java/com/android/server/AlarmManagerService.java
	services/java/com/android/server/am/ActivityStack.java
	services/java/com/android/server/display/WifiDisplayController.java
	tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderAction.java
	tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java

Change-Id: I3d3737341adfb137103de6892d33c6fe0a3160c3
parents 15d62b81 feef9887

Android.mk

+80 −17
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/print/ILayoutResultCallback.aidl \

	core/java/android/print/IPrinterDiscoveryObserver.aidl \

	core/java/android/print/IPrintDocumentAdapter.aidl \

	core/java/android/print/IPrintDocumentAdapterObserver.aidl \

	core/java/android/print/IPrintJobStateChangeListener.aidl \

	core/java/android/print/IPrintManager.aidl \

	core/java/android/print/IPrintSpooler.aidl \
@@ -260,10 +261,14 @@ LOCAL_SRC_FILES += \ 
	media/java/android/media/IAudioService.aidl \

	media/java/android/media/IAudioFocusDispatcher.aidl \

	media/java/android/media/IAudioRoutesObserver.aidl \

	media/java/android/media/IMediaRouterClient.aidl \

	media/java/android/media/IMediaRouterService.aidl \

	media/java/android/media/IMediaScannerListener.aidl \

	media/java/android/media/IMediaScannerService.aidl \

	media/java/android/media/IRemoteControlClient.aidl \

	media/java/android/media/IRemoteControlDisplay.aidl \

	media/java/android/media/IRemoteDisplayCallback.aidl \

	media/java/android/media/IRemoteDisplayProvider.aidl \

	media/java/android/media/IRemoteVolumeObserver.aidl \

	media/java/android/media/IRingtonePlayer.aidl \

	telephony/java/com/android/internal/telephony/IPhoneStateListener.aidl \
@@ -553,31 +558,89 @@ framework_docs_LOCAL_ADDITIONAL_JAVA_DIR:= \ 
framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES := \

    frameworks/base/docs/knowntags.txt



sample_dir := development/samples

sample_dir := development/samples/browseable

new_sample_dir := developers/samples/android



# Whitelist of valid groups, used for default TOC grouping. Each sample must

# belong to one (and only one) group. Assign samples to groups by setting

# a sample.group var to one of these groups in the sample's _index.jd.

sample_groups := -samplegroup Input \

                 -samplegroup Sensors \

                 -samplegroup Connectivity

sample_groups := -samplegroup Background \

                 -samplegroup Connectivity \

                 -samplegroup Content \

                 -samplegroup Input \

                 -samplegroup Media \

                 -samplegroup Security \

                 -samplegroup Testing \

                 -samplegroup UI \

                 -samplegroup Views



# the list here should match the list of samples included in the sdk samples package

# (see development/build/sdk.atree)

# remove htmlified samples for now -- samples are still available through the SDK

web_docs_sample_code_flags := \

		-hdf android.hasSamples 1 \

		-samplecode $(new_sample_dir)/input/gestures/BasicGestureDetect/BasicGestureDetect \

 		            samples/BasicGestureDetect/ "Basic Gestures" \

		-samplecode $(sample_dir)/AccelerometerPlay \

 		            samples/AccelerometerPlay "Accelerometer Play" \

		-samplecode $(sample_dir)/ActionBarCompat \

 		            samples/ActionBarCompat "Action Bar Compatibility" \

 		-samplecode $(sample_dir)/BluetoothHDP \

 		            samples/BluetoothHDP "Bluetooth HDP Demo" \

		-samplecode $(sample_dir)/BasicAccessibility \

 		            samples/BasicAccessibility "" \

		-samplecode $(sample_dir)/HorizontalPaging \

 		            samples/HorizontalPaging "" \

		-samplecode $(sample_dir)/ShareActionProvider \

 		            samples/ShareActionProvider "" \

		-samplecode $(sample_dir)/Styled \

 		            samples/Styled "" \

		-samplecode $(sample_dir)/BasicAndroidKeyStore \

 		            samples/BasicAndroidKeyStore "" \

		-samplecode $(sample_dir)/Basic \

 		            samples/Basic "" \

		-samplecode $(sample_dir)/ImmersiveMode \

 		            samples/ImmersiveMode "" \

		-samplecode $(sample_dir)/repeatingAlarm \

 		            samples/repeatingAlarm "" \

		-samplecode $(sample_dir)/TextLinkify \

 		            samples/TextLinkify "" \

		-samplecode $(sample_dir)/BasicMediaRouter \

 		            samples/BasicMediaRouter "" \

		-samplecode $(sample_dir)/BasicMultitouch \

 		            samples/BasicMultitouch "" \

		-samplecode $(sample_dir)/TextSwitcher \

 		            samples/TextSwitcher "" \

		-samplecode $(sample_dir)/ActivityInstrumentation \

 		            samples/ActivityInstrumentation "" \

		-samplecode $(sample_dir)/BorderlessButtons \

 		            samples/BorderlessButtons "" \

		-samplecode $(sample_dir)/BasicNotifications \

 		            samples/BasicNotifications "" \

		-samplecode $(sample_dir)/AdvancedImmersiveMode \

 		            samples/AdvancedImmersiveMode "" \

		-samplecode $(sample_dir)/BluetoothLeGatt \

 		            samples/BluetoothLeGatt "Bluetooth HDP Demo"

 		            samples/BluetoothLeGatt "" \

		-samplecode $(sample_dir)/NetworkConnect \

 		            samples/NetworkConnect "" \

		-samplecode $(sample_dir)/BasicNetworking \

 		            samples/BasicNetworking "" \

		-samplecode $(sample_dir)/BasicMediaDecoder \

 		            samples/BasicMediaDecoder "" \

		-samplecode $(sample_dir)/BasicImmersiveMode \

 		            samples/BasicImmersiveMode "" \

		-samplecode $(sample_dir)/CustomChoiceList \

 		            samples/CustomChoiceList "" \

		-samplecode $(sample_dir)/BasicContactables \

 		            samples/BasicContactables "" \

		-samplecode $(sample_dir)/BasicGestureDetect \

 		            samples/BasicGestureDetect "" \

		-samplecode $(sample_dir)/DoneBar \

 		            samples/DoneBar "" \

		-samplecode $(sample_dir)/ListPopupMenu \

 		            samples/ListPopupMenu "" \

		-samplecode $(sample_dir)/AppRestrictions \

 		            samples/AppRestrictions "" \

		-samplecode $(sample_dir)/CustomNotifications \

 		            samples/CustomNotifications "" \

		-samplecode $(sample_dir)/BasicSyncAdapter \

 		            samples/BasicSyncAdapter "" \

		-samplecode $(sample_dir)/StorageClient \

 		            samples/StorageClient "" 

#		-samplecode $(sample_dir)/StorageProvider \

# 		            samples/StorageProvider "" 

#       -samplecode $(sample_dir)/AndroidBeamDemo \

# 		            samples/AndroidBeamDemo "Android Beam Demo" \

# 		-samplecode $(sample_dir)/ApiDemos \
@@ -796,9 +859,9 @@ LOCAL_MODULE := online-sdk 
LOCAL_DROIDDOC_OPTIONS:= \

		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \

		-toroot / \

		-hdf android.whichdoc online

#		$(sample_groups) \

#		$(web_docs_sample_code_flags)

		-hdf android.whichdoc online \

		$(sample_groups) \

		$(web_docs_sample_code_flags)



LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk

cmds/am/src/com/android/commands/am/Am.java

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ public class Am extends BaseCommand { 
                "       am switch-user <USER_ID>\n" +

                "       am stop-user <USER_ID>\n" +

                "       am stack create <TASK_ID> <RELATIVE_STACK_BOX_ID> <POSITION> <WEIGHT>\n" +

                "       am stack movetask <STACK_ID> <TASK_ID> [true|false]\n" +

                "       am stack movetask <TASK_ID> <STACK_ID> [true|false]\n" +

                "       am stack resize <STACK_ID> <WEIGHT>\n" +

                "       am stack boxes\n" +

                "       am stack box <STACK_BOX_ID>\n" +

cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java

+13 −6
Original line number Diff line number Diff line
@@ -187,6 +187,12 @@ public final class Bmgr { 
    }



    private void doWipe() {

        String transport = nextArg();

        if (transport == null) {

            showUsage();

            return;

        }



        String pkg = nextArg();

        if (pkg == null) {

            showUsage();
@@ -194,8 +200,8 @@ public final class Bmgr { 
        }



        try {

            mBmgr.clearBackupData(pkg);

            System.out.println("Wiped backup data for " + pkg);

            mBmgr.clearBackupData(transport, pkg);

            System.out.println("Wiped backup data for " + pkg + " on " + transport);

        } catch (RemoteException e) {

            System.err.println(e.toString());

            System.err.println(BMGR_NOT_RUNNING_ERR);
@@ -446,7 +452,7 @@ public final class Bmgr { 
        System.err.println("       bmgr restore TOKEN PACKAGE...");

        System.err.println("       bmgr restore PACKAGE");

        System.err.println("       bmgr run");

        System.err.println("       bmgr wipe PACKAGE");

        System.err.println("       bmgr wipe TRANSPORT PACKAGE");

        System.err.println("");

        System.err.println("The 'backup' command schedules a backup pass for the named package.");

        System.err.println("Note that the backup pass will effectively be a no-op if the package");
@@ -462,8 +468,8 @@ public final class Bmgr { 
        System.err.println("");

        System.err.println("The 'list transports' command reports the names of the backup transports");

        System.err.println("currently available on the device.  These names can be passed as arguments");

        System.err.println("to the 'transport' command.  The currently selected transport is indicated");

        System.err.println("with a '*' character.");

        System.err.println("to the 'transport' and 'wipe' commands.  The currently selected transport");

        System.err.println("is indicated with a '*' character.");

        System.err.println("");

        System.err.println("The 'list sets' command reports the token and name of each restore set");

        System.err.println("available to the device via the current transport.");
@@ -491,7 +497,8 @@ public final class Bmgr { 
        System.err.println("data changes.");

        System.err.println("");

        System.err.println("The 'wipe' command causes all backed-up data for the given package to be");

        System.err.println("erased from the current transport's storage.  The next backup operation");

        System.err.println("erased from the given transport's storage.  The next backup operation");

        System.err.println("that the given application performs will rewrite its entire data set.");

        System.err.println("Transport names to use here are those reported by 'list transports'.");

    }

}

core/java/android/app/Activity.java

+9 −21
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ import android.text.method.TextKeyListener; 
import android.util.AttributeSet;

import android.util.EventLog;

import android.util.Log;

import android.util.PrintWriterPrinter;

import android.util.Slog;

import android.util.SparseArray;

import android.view.ActionMode;
@@ -4846,36 +4847,23 @@ public class Activity extends ContextThemeWrapper 
                writer.println(mChangingConfigurations);

        writer.print(innerPrefix); writer.print("mCurrentConfig=");

                writer.println(mCurrentConfig);



        if (mLoaderManager != null) {

            writer.print(prefix); writer.print("Loader Manager ");

                    writer.print(Integer.toHexString(System.identityHashCode(mLoaderManager)));

                    writer.println(":");

            mLoaderManager.dump(prefix + "  ", fd, writer, args);

        }



        mFragments.dump(prefix, fd, writer, args);

        writer.print(prefix); writer.println("View Hierarchy:");

        dumpViewHierarchy(prefix + "  ", writer, getWindow().getDecorView());

    }



    private void dumpViewHierarchy(String prefix, PrintWriter writer, View view) {

        writer.print(prefix);

        if (view == null) {

            writer.println("null");

            return;

        }

        writer.println(view.toString());

        if (!(view instanceof ViewGroup)) {

            return;

        }

        ViewGroup grp = (ViewGroup)view;

        final int N = grp.getChildCount();

        if (N <= 0) {

            return;

        }

        prefix = prefix + "  ";

        for (int i=0; i<N; i++) {

            dumpViewHierarchy(prefix, writer, grp.getChildAt(i));

        if (getWindow() != null &&

                getWindow().peekDecorView() != null &&

                getWindow().peekDecorView().getViewRootImpl() != null) {

            getWindow().peekDecorView().getViewRootImpl().dump(prefix, fd, writer, args);

        }



        mHandler.getLooper().dump(new PrintWriterPrinter(writer), prefix);

    }



    /**

core/java/android/app/ActivityManager.java

+6 −3
Original line number Diff line number Diff line
@@ -2272,9 +2272,12 @@ public class ActivityManager { 
    public static void dumpPackageStateStatic(FileDescriptor fd, String packageName) {

        FileOutputStream fout = new FileOutputStream(fd);

        PrintWriter pw = new FastPrintWriter(fout);

        dumpService(pw, fd, Context.ACTIVITY_SERVICE, new String[] { "package", packageName });

        dumpService(pw, fd, Context.ACTIVITY_SERVICE, new String[] {

                "-a", "package", packageName });

        pw.println();

        dumpService(pw, fd, ProcessStats.SERVICE_NAME, new String[] { packageName });

        dumpService(pw, fd, "meminfo", new String[] { "--local", packageName });

        pw.println();

        dumpService(pw, fd, ProcessStats.SERVICE_NAME, new String[] { "-a", packageName });

        pw.println();

        dumpService(pw, fd, "usagestats", new String[] { "--packages", packageName });

        pw.println();
@@ -2296,7 +2299,7 @@ public class ActivityManager { 
            pw.flush();

            tp = new TransferPipe();

            tp.setBufferPrefix("  ");

            service.dump(tp.getWriteFd().getFileDescriptor(), args);

            service.dumpAsync(tp.getWriteFd().getFileDescriptor(), args);

            tp.go(fd);

        } catch (Throwable e) {

            if (tp != null) {