Merge commit 'bac61807d3bcfff957b358cb9ad77850bd373689' into HEAD (ebcb32f5) · Commits · e / os / android_frameworks_base

Android.mk

+80 −17

Original line number	Diff line number	Diff line
		@@ -165,6 +165,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 \
		@@ -250,10 +251,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 \
		@@ -537,31 +542,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 \
		@@ -780,9 +843,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

api/current.txt

+10 −8

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ package android {
		field public static final java.lang.String BIND_APPWIDGET = "android.permission.BIND_APPWIDGET";
		field public static final java.lang.String BIND_DEVICE_ADMIN = "android.permission.BIND_DEVICE_ADMIN";
		field public static final java.lang.String BIND_INPUT_METHOD = "android.permission.BIND_INPUT_METHOD";
		field public static final java.lang.String BIND_NFC_SERVICE = "android.permission.BIND_NFC_SERVICE";
		field public static final java.lang.String BIND_NOTIFICATION_LISTENER_SERVICE = "android.permission.BIND_NOTIFICATION_LISTENER_SERVICE";
		field public static final java.lang.String BIND_PRINT_SERVICE = "android.permission.BIND_PRINT_SERVICE";
		field public static final java.lang.String BIND_REMOTEVIEWS = "android.permission.BIND_REMOTEVIEWS";
		@@ -3083,18 +3084,18 @@ package android.app {
		method public void cancel(android.app.PendingIntent);
		method public void set(int, long, android.app.PendingIntent);
		method public void setExact(int, long, android.app.PendingIntent);
		method public deprecated void setInexactRepeating(int, long, long, android.app.PendingIntent);
		method public void setInexactRepeating(int, long, long, android.app.PendingIntent);
		method public void setRepeating(int, long, long, android.app.PendingIntent);
		method public void setTime(long);
		method public void setTimeZone(java.lang.String);
		method public void setWindow(int, long, long, android.app.PendingIntent);
		field public static final int ELAPSED_REALTIME = 3; // 0x3
		field public static final int ELAPSED_REALTIME_WAKEUP = 2; // 0x2
		field public static final deprecated long INTERVAL_DAY = 86400000L; // 0x5265c00L
		field public static final deprecated long INTERVAL_FIFTEEN_MINUTES = 900000L; // 0xdbba0L
		field public static final deprecated long INTERVAL_HALF_DAY = 43200000L; // 0x2932e00L
		field public static final deprecated long INTERVAL_HALF_HOUR = 1800000L; // 0x1b7740L
		field public static final deprecated long INTERVAL_HOUR = 3600000L; // 0x36ee80L
		field public static final long INTERVAL_DAY = 86400000L; // 0x5265c00L
		field public static final long INTERVAL_FIFTEEN_MINUTES = 900000L; // 0xdbba0L
		field public static final long INTERVAL_HALF_DAY = 43200000L; // 0x2932e00L
		field public static final long INTERVAL_HALF_HOUR = 1800000L; // 0x1b7740L
		field public static final long INTERVAL_HOUR = 3600000L; // 0x36ee80L
		field public static final int RTC = 1; // 0x1
		field public static final int RTC_WAKEUP = 0; // 0x0
		}
		@@ -13227,6 +13228,7 @@ package android.media.audiofx {
		field public static final java.util.UUID EFFECT_TYPE_BASS_BOOST;
		field public static final java.util.UUID EFFECT_TYPE_ENV_REVERB;
		field public static final java.util.UUID EFFECT_TYPE_EQUALIZER;
		field public static final java.util.UUID EFFECT_TYPE_LOUDNESS_ENHANCER;
		field public static final java.util.UUID EFFECT_TYPE_NS;
		field public static final java.util.UUID EFFECT_TYPE_PRESET_REVERB;
		field public static final java.util.UUID EFFECT_TYPE_VIRTUALIZER;
		@@ -13384,6 +13386,7 @@ package android.media.audiofx {
		}

		public class LoudnessEnhancer extends android.media.audiofx.AudioEffect {
		ctor public LoudnessEnhancer(int) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.RuntimeException, java.lang.UnsupportedOperationException;
		method public float getTargetGain() throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
		method public void setTargetGain(int) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
		field public static final int PARAM_TARGET_GAIN_MB = 0; // 0x0
		@@ -25632,10 +25635,8 @@ package android.transition {
		ctor public TransitionManager();
		method public static void beginDelayedTransition(android.view.ViewGroup);
		method public static void beginDelayedTransition(android.view.ViewGroup, android.transition.Transition);
		method public static android.transition.Transition getDefaultTransition();
		method public static void go(android.transition.Scene);
		method public static void go(android.transition.Scene, android.transition.Transition);
		method public void setDefaultTransition(android.transition.Transition);
		method public void setTransition(android.transition.Scene, android.transition.Transition);
		method public void setTransition(android.transition.Scene, android.transition.Scene, android.transition.Transition);
		method public void transitionTo(android.transition.Scene);
		@@ -25794,6 +25795,7 @@ package android.util {
		method public boolean equals(android.util.DisplayMetrics);
		method public void setTo(android.util.DisplayMetrics);
		method public void setToDefaults();
		field public static final int DENSITY_400 = 400; // 0x190
		field public static final int DENSITY_DEFAULT = 160; // 0xa0
		field public static final int DENSITY_HIGH = 240; // 0xf0
		field public static final int DENSITY_LOW = 120; // 0x78

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" +

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) {