Snap for 6004191 from 2612ee2d6deb6addd227217d87bef76746dc463b to qt-qpr2-release (d2bd2646) · Commits · e / os / android_frameworks_base

cmds/statsd/src/main.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,8 @@ void sigHandler(int sig) {
		if (gStatsService != nullptr) {
		gStatsService->Terminate();
		}
		ALOGW("statsd terminated on receiving signal %d.", sig);
		exit(1);
		}

		void registerSigHandler()

+8 −0

Original line number	Diff line number	Diff line
		@@ -2042,6 +2042,13 @@ public class UserManager {
		* by {@link #createUser(String, int)} or {@link #createGuest(Context, String)}), it takes
		* less time.
		*
		* <p>This method completes the majority of work necessary for user creation: it
		* creates user data, CE and DE encryption keys, app data directories, initializes the user and
		* grants default permissions. When pre-created users become "real" users, only then are
		* components notified of new user creation by firing user creation broadcasts.
		*
		* <p>All pre-created users are removed during system upgrade.
		*
		* <p>Requires {@link android.Manifest.permission#MANAGE_USERS} permission.
		*
		* @param flags UserInfo flags that identify the type of user and other properties.
		@@ -2055,6 +2062,7 @@ public class UserManager {
		*
		* @hide
		*/
		@RequiresPermission(android.Manifest.permission.MANAGE_USERS)
		public @Nullable UserInfo preCreateUser(@UserInfoFlag int flags) {
		try {
		return mService.preCreateUser(flags);

+1 −1

Original line number	Diff line number	Diff line
		@@ -245,7 +245,7 @@ public class DisplayMetrics {
		* this density value will be 1; on a 120 dpi screen it would be .75; etc.
		*
		* <p>This value does not exactly follow the real screen size (as given by
		* {@link #xdpi} and {@link #ydpi}, but rather is used to scale the size of
		* {@link #xdpi} and {@link #ydpi}), but rather is used to scale the size of
		* the overall UI in steps based on gross changes in the display dpi. For
		* example, a 240x320 screen will have a density of 1 even if its width is
		* 1.8", 1.3", etc. However, if the screen resolution is increased to

+2 −2

Original line number	Diff line number	Diff line
		@@ -1266,12 +1266,12 @@ public class NumberPicker extends LinearLayout {
		* current value is set to the {@link NumberPicker#getMaxValue()} value.
		* </p>
		* <p>
		* If the argument is less than the {@link NumberPicker#getMaxValue()} and
		* If the argument is more than the {@link NumberPicker#getMaxValue()} and
		* {@link NumberPicker#getWrapSelectorWheel()} is <code>false</code> the
		* current value is set to the {@link NumberPicker#getMaxValue()} value.
		* </p>
		* <p>
		* If the argument is less than the {@link NumberPicker#getMaxValue()} and
		* If the argument is more than the {@link NumberPicker#getMaxValue()} and
		* {@link NumberPicker#getWrapSelectorWheel()} is <code>true</code> the
		* current value is set to the {@link NumberPicker#getMinValue()} value.
		* </p>

+4 −2

Original line number	Diff line number	Diff line
		@@ -2095,9 +2095,11 @@ public class Canvas extends BaseCanvas {

		/**
		* Draw the text, with origin at (x,y), using the specified paint, along the specified path. The
		* paint's Align setting determins where along the path to start the text.
		* paint's Align setting determines where along the path to start the text.
		*
		* @param text The text to be drawn
		* @param index The starting index within the text to be drawn
		* @param count Starting from index, the number of characters to draw
		* @param path The path the text should follow for its baseline
		* @param hOffset The distance along the path to add to the text's starting position
		* @param vOffset The distance above(-) or below(+) the path to position the text
		@@ -2110,7 +2112,7 @@ public class Canvas extends BaseCanvas {

		/**
		* Draw the text, with origin at (x,y), using the specified paint, along the specified path. The
		* paint's Align setting determins where along the path to start the text.
		* paint's Align setting determines where along the path to start the text.
		*
		* @param text The text to be drawn
		* @param path The path the text should follow for its baseline