Merge "Revert "Merge restartInput into startInput in internal IPC""
diff --git a/api/current.txt b/api/current.txt
index 1a56525..302b99a 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -3140,6 +3140,7 @@
public final class AnimatorSet extends android.animation.Animator {
ctor public AnimatorSet();
method public java.util.ArrayList<android.animation.Animator> getChildAnimations();
+ method public long getCurrentPlayTime();
method public long getDuration();
method public long getStartDelay();
method public boolean isRunning();
@@ -12244,6 +12245,7 @@
field public int inTargetDensity;
field public byte[] inTempStorage;
field public deprecated boolean mCancel;
+ field public android.graphics.Bitmap.Config outConfig;
field public int outHeight;
field public java.lang.String outMimeType;
field public int outWidth;
diff --git a/api/system-current.txt b/api/system-current.txt
index 06411d0..4869440 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -3260,6 +3260,7 @@
public final class AnimatorSet extends android.animation.Animator {
ctor public AnimatorSet();
method public java.util.ArrayList<android.animation.Animator> getChildAnimations();
+ method public long getCurrentPlayTime();
method public long getDuration();
method public long getStartDelay();
method public boolean isRunning();
@@ -12833,6 +12834,7 @@
field public int inTargetDensity;
field public byte[] inTempStorage;
field public deprecated boolean mCancel;
+ field public android.graphics.Bitmap.Config outConfig;
field public int outHeight;
field public java.lang.String outMimeType;
field public int outWidth;
diff --git a/api/test-current.txt b/api/test-current.txt
index cde9bdc..7c06b9e 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -3140,6 +3140,7 @@
public final class AnimatorSet extends android.animation.Animator {
ctor public AnimatorSet();
method public java.util.ArrayList<android.animation.Animator> getChildAnimations();
+ method public long getCurrentPlayTime();
method public long getDuration();
method public long getStartDelay();
method public boolean isRunning();
@@ -12278,6 +12279,7 @@
field public int inTargetDensity;
field public byte[] inTempStorage;
field public deprecated boolean mCancel;
+ field public android.graphics.Bitmap.Config outConfig;
field public int outHeight;
field public java.lang.String outMimeType;
field public int outWidth;
diff --git a/core/java/android/animation/AnimatorSet.java b/core/java/android/animation/AnimatorSet.java
index 4e3b7d0..2940e86 100644
--- a/core/java/android/animation/AnimatorSet.java
+++ b/core/java/android/animation/AnimatorSet.java
@@ -142,11 +142,17 @@
// the animation was previously seeked and therefore doesn't start from the beginning).
private final boolean mShouldResetValuesAtStart;
+ // In pre-O releases, end() may never explicitly called on a child animator. As a result, end()
+ // may not even be properly implemented in a lot of cases. After a few apps crashing on this,
+ // it became necessary to use an sdk target guard for calling end().
+ private final boolean mEndCanBeCalled;
+
// The time, in milliseconds, when last frame of the animation came in. -1 when the animation is
// not running.
private long mLastFrameTime = -1;
- // The time, in milliseconds, when the first frame of the animation came in.
+ // The time, in milliseconds, when the first frame of the animation came in. This is the
+ // frame before we start counting down the start delay, if any.
// -1 when the animation is not running.
private long mFirstFrame = -1;
@@ -191,11 +197,12 @@
super();
mNodeMap.put(mDelayAnim, mRootNode);
mNodes.add(mRootNode);
+ boolean isPreO;
// Set the flag to ignore calling end() without start() for pre-N releases
Application app = ActivityThread.currentApplication();
if (app == null || app.getApplicationInfo() == null) {
mShouldIgnoreEndWithoutStart = true;
- mShouldResetValuesAtStart = false;
+ isPreO = true;
} else {
if (app.getApplicationInfo().targetSdkVersion < Build.VERSION_CODES.N) {
mShouldIgnoreEndWithoutStart = true;
@@ -203,12 +210,10 @@
mShouldIgnoreEndWithoutStart = false;
}
- if (app.getApplicationInfo().targetSdkVersion < Build.VERSION_CODES.O) {
- mShouldResetValuesAtStart = false;
- } else {
- mShouldResetValuesAtStart = true;
- }
+ isPreO = app.getApplicationInfo().targetSdkVersion < Build.VERSION_CODES.O;
}
+ mShouldResetValuesAtStart = !isPreO;
+ mEndCanBeCalled = !isPreO;
}
/**
@@ -424,6 +429,35 @@
}
}
+ // Force all the animations to end when the duration scale is 0.
+ private void forceToEnd() {
+ if (mEndCanBeCalled) {
+ end();
+ } else {
+ // Note: we don't want to combine this case with the end() method below because in
+ // the case of developer calling end(), we still need to make sure end() is explicitly
+ // called on the child animators to maintain the old behavior.
+ if (mReversing) {
+ mLastEventId = mLastEventId == -1 ? mEvents.size() : mLastEventId;
+ for (int j = mLastEventId - 1; j >= 0; j--) {
+ AnimationEvent event = mEvents.get(j);
+ if (event.mEvent == AnimationEvent.ANIMATION_END) {
+ event.mNode.mAnimation.reverse();
+ }
+ }
+ } else {
+ for (int j = mLastEventId + 1; j < mEvents.size(); j++) {
+ AnimationEvent event = mEvents.get(j);
+ if (event.mEvent == AnimationEvent.ANIMATION_START) {
+ event.mNode.mAnimation.start();
+ }
+ }
+ }
+ mPlayingSet.clear();
+ endAnimation();
+ }
+ }
+
/**
* {@inheritDoc}
*
@@ -445,19 +479,28 @@
mLastEventId = mLastEventId == -1 ? mEvents.size() : mLastEventId;
for (int j = mLastEventId - 1; j >= 0; j--) {
AnimationEvent event = mEvents.get(j);
+ Animator anim = event.mNode.mAnimation;
if (event.mEvent == AnimationEvent.ANIMATION_END) {
- event.mNode.mAnimation.reverse();
- } else if (event.mEvent == AnimationEvent.ANIMATION_DELAY_ENDED) {
- event.mNode.mAnimation.end();
+ anim.reverse();
+ } else if (event.mEvent == AnimationEvent.ANIMATION_DELAY_ENDED
+ && anim.isStarted()) {
+ // Make sure anim hasn't finished before calling end() so that we don't end
+ // already ended animations, which will cause start and end callbacks to be
+ // triggered again.
+ anim.end();
}
}
} else {
for (int j = mLastEventId + 1; j < mEvents.size(); j++) {
AnimationEvent event = mEvents.get(j);
+ Animator anim = event.mNode.mAnimation;
if (event.mEvent == AnimationEvent.ANIMATION_START) {
- event.mNode.mAnimation.start();
- } else if (event.mEvent == AnimationEvent.ANIMATION_END) {
- event.mNode.mAnimation.end();
+ anim.start();
+ } else if (event.mEvent == AnimationEvent.ANIMATION_END && anim.isStarted()) {
+ // Make sure anim hasn't finished before calling end() so that we don't end
+ // already ended animations, which will cause start and end callbacks to be
+ // triggered again.
+ anim.end();
}
}
}
@@ -476,12 +519,10 @@
*/
@Override
public boolean isRunning() {
- if (mStartDelay > 0) {
- return mStarted && !mDelayAnim.isRunning();
- } else {
- // No start delay, animation should start right away
+ if (mStartDelay == 0) {
return mStarted;
}
+ return mLastFrameTime > 0;
}
@Override
@@ -673,8 +714,8 @@
mReversing = inReverse;
// Now that all dependencies are set up, start the animations that should be started.
- boolean setIsEmpty = isEmptySet(this);
- if (!setIsEmpty) {
+ boolean isZeroDuration = ValueAnimator.getDurationScale() == 0f || isEmptySet(this);
+ if (!isZeroDuration) {
startAnimation();
}
@@ -686,9 +727,10 @@
tmpListeners.get(i).onAnimationStart(this, inReverse);
}
}
- if (setIsEmpty) {
- // In the case of empty AnimatorSet, we will trigger the onAnimationEnd() right away.
- end();
+ if (isZeroDuration) {
+ // In the case of empty AnimatorSet, or 0 duration scale, we will trigger the
+ // onAnimationEnd() right away.
+ forceToEnd();
}
}
@@ -815,6 +857,9 @@
for (int i = 0; i < unfinishedNodes.size(); i++) {
Node node = unfinishedNodes.get(i);
long playTime = getPlayTimeForNode(currentPlayTime, node, inReverse);
+ if (!inReverse) {
+ playTime -= node.mAnimation.getStartDelay();
+ }
node.mAnimation.animateBasedOnPlayTime(playTime, lastPlayTime, inReverse);
}
}
@@ -889,6 +934,31 @@
}
}
+ /**
+ * Gets the current position of the animation in time, which is equal to the current
+ * time minus the time that the animation started. An animation that is not yet started will
+ * return a value of zero, unless the animation has has its play time set via
+ * {@link #setCurrentPlayTime(long)}, in which case it will return the time that was set.
+ *
+ * @return The current position in time of the animation.
+ */
+ public long getCurrentPlayTime() {
+ if (mSeekState.isActive()) {
+ return mSeekState.getPlayTime();
+ }
+ if (mLastFrameTime == -1) {
+ // Not yet started or during start delay
+ return 0;
+ }
+ float durationScale = ValueAnimator.getDurationScale();
+ durationScale = durationScale == 0 ? 1 : durationScale;
+ if (mReversing) {
+ return (long) ((mLastFrameTime - mFirstFrame) / durationScale);
+ } else {
+ return (long) ((mLastFrameTime - mFirstFrame - mStartDelay) / durationScale);
+ }
+ }
+
private void initChildren() {
if (!isInitialized()) {
mChildrenInitialized = true;
@@ -907,8 +977,17 @@
*/
@Override
public boolean doAnimationFrame(long frameTime) {
- if (mLastFrameTime < 0) {
- mFirstFrame = mLastFrameTime = frameTime;
+ float durationScale = ValueAnimator.getDurationScale();
+ if (durationScale == 0f) {
+ // Duration scale changed to 0 amid animation, end the animation right away.
+ forceToEnd();
+ return true;
+ }
+
+ // After the first frame comes in, we need to wait for start delay to pass before updating
+ // any animation values.
+ if (mFirstFrame < 0) {
+ mFirstFrame = frameTime;
}
// Handle pause/resume
@@ -928,19 +1007,31 @@
// Continue at seeked position
if (mSeekState.isActive()) {
mSeekState.updateSeekDirection(mReversing);
- mFirstFrame = frameTime - mSeekState.getPlayTime() - mStartDelay;
+ if (mReversing) {
+ mFirstFrame = (long) (frameTime - mSeekState.getPlayTime() * durationScale);
+ } else {
+ mFirstFrame = (long) (frameTime - (mSeekState.getPlayTime() + mStartDelay)
+ * durationScale);
+ }
mSeekState.reset();
}
- // This playTime includes the start delay.
- long playTime = frameTime - mFirstFrame;
+ if (!mReversing && frameTime < mFirstFrame + mStartDelay * durationScale) {
+ // Still during start delay in a forward playing case.
+ return false;
+ }
+
+ // From here on, we always use unscaled play time. Note this unscaled playtime includes
+ // the start delay.
+ long unscaledPlayTime = (long) ((frameTime - mFirstFrame) / durationScale);
+ mLastFrameTime = frameTime;
// 1. Pulse the animators that will start or end in this frame
// 2. Pulse the animators that will finish in a later frame
- int latestId = findLatestEventIdForTime(playTime);
+ int latestId = findLatestEventIdForTime(unscaledPlayTime);
int startId = mLastEventId;
- handleAnimationEvents(startId, latestId, playTime);
+ handleAnimationEvents(startId, latestId, unscaledPlayTime);
mLastEventId = latestId;
@@ -948,8 +1039,7 @@
for (int i = 0; i < mPlayingSet.size(); i++) {
Node node = mPlayingSet.get(i);
if (!node.mEnded) {
- node.mEnded = node.mAnimation.pulseAnimationFrame(
- getPlayTimeForNode(playTime, node));
+ pulseFrame(node, getPlayTimeForNode(unscaledPlayTime, node));
}
}
@@ -960,20 +1050,22 @@
}
}
- mLastFrameTime = frameTime;
- if (mPlayingSet.isEmpty()) {
- boolean finished;
- if (mReversing) {
- // Make sure there's no more END event before current event id and after start delay
- finished = mLastEventId <= 3;
- } else {
- // Make sure there's no more START event before current event id:
- finished = (mLastEventId == mEvents.size() - 1);
+ boolean finished = false;
+ if (mReversing) {
+ if (mPlayingSet.size() == 1 && mPlayingSet.get(0) == mRootNode) {
+ // The only animation that is running is the delay animation.
+ finished = true;
+ } else if (mPlayingSet.isEmpty() && mLastEventId < 3) {
+ // The only remaining animation is the delay animation
+ finished = true;
}
- if (finished) {
- endAnimation();
- return true;
- }
+ } else {
+ finished = mPlayingSet.isEmpty() && mLastEventId == mEvents.size() - 1;
+ }
+
+ if (finished) {
+ endAnimation();
+ return true;
}
return false;
}
@@ -1029,9 +1121,17 @@
}
}
- private void pulseFrame(Node node, long frameTime) {
+ /**
+ * This method pulses frames into child animations. It scales the input animation play time
+ * with the duration scale and pass that to the child animation via pulseAnimationFrame(long).
+ *
+ * @param node child animator node
+ * @param animPlayTime unscaled play time (including start delay) for the child animator
+ */
+ private void pulseFrame(Node node, long animPlayTime) {
if (!node.mEnded) {
- node.mEnded = node.mAnimation.pulseAnimationFrame(frameTime);
+ node.mEnded = node.mAnimation.pulseAnimationFrame(
+ (long) (animPlayTime * ValueAnimator.getDurationScale()));
}
}
@@ -1052,7 +1152,7 @@
addDummyListener();
// Register animation callback
- addAnimationCallback(mStartDelay);
+ addAnimationCallback(0);
if (mSeekState.getPlayTimeNormalized() == 0 && mReversing) {
// Maintain old behavior, if seeked to 0 then call reverse, we'll treat the case
@@ -1061,7 +1161,11 @@
}
// Set the child animators to the right end:
if (mShouldResetValuesAtStart) {
- if (mReversing || isInitialized()) {
+ if (isInitialized()) {
+ skipToEndValue(!mReversing);
+ } else if (mReversing) {
+ // Reversing but haven't initialized all the children yet.
+ initChildren();
skipToEndValue(!mReversing);
} else {
// If not all children are initialized and play direction is forward
@@ -1091,6 +1195,11 @@
}
int toId = findLatestEventIdForTime(playTime);
handleAnimationEvents(-1, toId, playTime);
+ for (int i = mPlayingSet.size() - 1; i >= 0; i--) {
+ if (mPlayingSet.get(i).mEnded) {
+ mPlayingSet.remove(i);
+ }
+ }
mLastEventId = toId;
}
}
@@ -1797,6 +1906,7 @@
if (mPlayTime >= 0) {
if (inReverse != mSeekingInReverse) {
mPlayTime = getTotalDuration() - mStartDelay - mPlayTime;
+ mSeekingInReverse = inReverse;
}
}
}
diff --git a/core/java/android/animation/ValueAnimator.java b/core/java/android/animation/ValueAnimator.java
index 558fdc6..4e31e44 100644
--- a/core/java/android/animation/ValueAnimator.java
+++ b/core/java/android/animation/ValueAnimator.java
@@ -1031,6 +1031,7 @@
// started-but-not-yet-reached-the-first-frame phase.
mLastFrameTime = -1;
mFirstFrameTime = -1;
+ mStartTime = -1;
addAnimationCallback(0);
if (mStartDelay == 0 || mSeekFraction >= 0 || mReversing) {
@@ -1199,7 +1200,7 @@
mStartListenersCalled = false;
mLastFrameTime = -1;
mFirstFrameTime = -1;
- mReversing = false;
+ mStartTime = -1;
if (notify && mListeners != null) {
ArrayList<AnimatorListener> tmpListeners =
(ArrayList<AnimatorListener>) mListeners.clone();
@@ -1208,6 +1209,7 @@
tmpListeners.get(i).onAnimationEnd(this, mReversing);
}
}
+ // mReversing needs to be reset *after* notifying the listeners for the end callbacks.
mReversing = false;
if (Trace.isTagEnabled(Trace.TRACE_TAG_VIEW)) {
Trace.asyncTraceEnd(Trace.TRACE_TAG_VIEW, getNameForTrace(),
@@ -1392,9 +1394,10 @@
* @hide
*/
public final boolean doAnimationFrame(long frameTime) {
- if (!mRunning && mStartTime < 0) {
- // First frame during delay
- mStartTime = frameTime + mStartDelay;
+ if (mStartTime < 0) {
+ // First frame. If there is start delay, start delay count down will happen *after* this
+ // frame.
+ mStartTime = mReversing ? frameTime : frameTime + mStartDelay;
}
// Handle pause/resume
@@ -1411,25 +1414,23 @@
}
if (!mRunning) {
- // If not running, that means the animation is in the start delay phase. In the case of
- // reversing, we want to run start delay in the end.
- if (mStartTime > frameTime) {
- // During start delay
+ // If not running, that means the animation is in the start delay phase of a forward
+ // running animation. In the case of reversing, we want to run start delay in the end.
+ if (mStartTime > frameTime && mSeekFraction == -1) {
+ // This is when no seek fraction is set during start delay. If developers change the
+ // seek fraction during the delay, animation will start from the seeked position
+ // right away.
return false;
} else {
- // Start delay has passed.
+ // If mRunning is not set by now, that means non-zero start delay,
+ // no seeking, not reversing. At this point, start delay has passed.
mRunning = true;
+ startAnimation();
}
}
if (mLastFrameTime < 0) {
- // First frame
- if (mStartDelay > 0) {
- startAnimation();
- }
- if (mSeekFraction < 0) {
- mStartTime = frameTime;
- } else {
+ if (mSeekFraction >= 0) {
long seekTime = (long) (getScaledDuration() * mSeekFraction);
mStartTime = frameTime - seekTime;
mSeekFraction = -1;
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index dfcab3d..e4d11da 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -1048,6 +1048,10 @@
* allowed to run code through scheduled alarms, receiving broadcasts,
* etc. A started user may be either the current foreground user or a
* background user; the result here does not distinguish between the two.
+ * <p>Requires {@code android.permission.MANAGE_USERS} or
+ * {@code android.permission.INTERACT_ACROSS_USERS}, otherwise specified {@link UserHandle user}
+ * must be the calling user or a managed profile associated with it.
+ *
* @param user The user to retrieve the running state for.
*/
public boolean isUserRunning(UserHandle user) {
@@ -1068,6 +1072,10 @@
* This is like {@link #isUserRunning(UserHandle)}, but will also return
* true if the user had been running but is in the process of being stopped
* (but is not yet fully stopped, and still running some code).
+ * <p>Requires {@code android.permission.MANAGE_USERS} or
+ * {@code android.permission.INTERACT_ACROSS_USERS}, otherwise specified {@link UserHandle user}
+ * must be the calling user or a managed profile associated with it.
+ *
* @param user The user to retrieve the running state for.
*/
public boolean isUserRunningOrStopping(UserHandle user) {
@@ -1142,6 +1150,9 @@
* When a user is locked, only device-protected data storage is available.
* When a user is unlocked, both device-protected and credential-protected
* private app data storage is available.
+ * <p>Requires {@code android.permission.MANAGE_USERS} or
+ * {@code android.permission.INTERACT_ACROSS_USERS}, otherwise specified {@link UserHandle user}
+ * must be the calling user or a managed profile associated with it.
*
* @param user to retrieve the unlocked state for.
* @see Intent#ACTION_USER_UNLOCKED
diff --git a/core/java/android/preference/PreferenceActivity.java b/core/java/android/preference/PreferenceActivity.java
index 5e7f68b..600d82f 100644
--- a/core/java/android/preference/PreferenceActivity.java
+++ b/core/java/android/preference/PreferenceActivity.java
@@ -602,7 +602,9 @@
if (mHeaders.size() > 0) {
setListAdapter(new HeaderAdapter(this, mHeaders, mPreferenceHeaderItemResId,
mPreferenceHeaderRemoveEmptyIcon));
- getListView().setChoiceMode(AbsListView.CHOICE_MODE_SINGLE);
+ if (!mSinglePane) {
+ getListView().setChoiceMode(AbsListView.CHOICE_MODE_SINGLE);
+ }
}
if (mSinglePane && initialFragment != null && initialTitle != 0) {
diff --git a/core/java/android/view/Display.java b/core/java/android/view/Display.java
index 3ba55ed..83b6a52 100644
--- a/core/java/android/view/Display.java
+++ b/core/java/android/view/Display.java
@@ -339,6 +339,21 @@
public static final int COLOR_MODE_DISPLAY_P3 = 9;
/**
+ * Indicates that when display is removed, all its activities will be moved to the primary
+ * display and the topmost activity should become focused.
+ *
+ * @hide
+ */
+ public static final int REMOVE_MODE_MOVE_CONTENT_TO_PRIMARY = 0;
+ /**
+ * Indicates that when display is removed, all its stacks and tasks will be removed, all
+ * activities will be destroyed according to the usual lifecycle.
+ *
+ * @hide
+ */
+ public static final int REMOVE_MODE_DESTROY_CONTENT = 1;
+
+ /**
* Internal method to create a display.
* Applications should use {@link android.view.WindowManager#getDefaultDisplay()}
* or {@link android.hardware.display.DisplayManager#getDisplay}
@@ -770,6 +785,20 @@
}
/**
+ * @hide
+ * Get current remove mode of the display - what actions should be performed with the display's
+ * content when it is removed. Default behavior for public displays in this case is to move all
+ * activities to the primary display and make it focused. For private display - destroy all
+ * activities.
+ *
+ * @see #REMOVE_MODE_MOVE_CONTENT_TO_PRIMARY
+ * @see #REMOVE_MODE_DESTROY_CONTENT
+ */
+ public int getRemoveMode() {
+ return mDisplayInfo.removeMode;
+ }
+
+ /**
* Returns the display's HDR capabilities.
*
* @see #isHdr()
diff --git a/core/java/android/view/DisplayInfo.java b/core/java/android/view/DisplayInfo.java
index f6b94af..3d11dcb 100644
--- a/core/java/android/view/DisplayInfo.java
+++ b/core/java/android/view/DisplayInfo.java
@@ -238,6 +238,15 @@
*/
public String ownerPackageName;
+ /**
+ * @hide
+ * Get current remove mode of the display - what actions should be performed with the display's
+ * content when it is removed.
+ *
+ * @see Display#getRemoveMode()
+ */
+ public int removeMode = Display.REMOVE_MODE_MOVE_CONTENT_TO_PRIMARY;
+
public static final Creator<DisplayInfo> CREATOR = new Creator<DisplayInfo>() {
@Override
public DisplayInfo createFromParcel(Parcel source) {
@@ -298,7 +307,8 @@
&& presentationDeadlineNanos == other.presentationDeadlineNanos
&& state == other.state
&& ownerUid == other.ownerUid
- && Objects.equal(ownerPackageName, other.ownerPackageName);
+ && Objects.equal(ownerPackageName, other.ownerPackageName)
+ && removeMode == other.removeMode;
}
@Override
@@ -341,6 +351,7 @@
state = other.state;
ownerUid = other.ownerUid;
ownerPackageName = other.ownerPackageName;
+ removeMode = other.removeMode;
}
public void readFromParcel(Parcel source) {
@@ -385,6 +396,7 @@
ownerUid = source.readInt();
ownerPackageName = source.readString();
uniqueId = source.readString();
+ removeMode = source.readInt();
}
@Override
@@ -428,6 +440,7 @@
dest.writeInt(ownerUid);
dest.writeString(ownerPackageName);
dest.writeString(uniqueId);
+ dest.writeInt(removeMode);
}
@Override
@@ -637,6 +650,8 @@
sb.append(" (uid ").append(ownerUid).append(")");
}
sb.append(flagsToString(flags));
+ sb.append(", removeMode ");
+ sb.append(removeMode);
sb.append("}");
return sb.toString();
}
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index b06c3fd..d468117 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -858,6 +858,17 @@
*/
static boolean sHasFocusableExcludeAutoFocusable;
+ /**
+ * Prior to O, auto-focusable didn't exist and views marked as clickable weren't implicitly
+ * made focusable by default. As a result, apps could (incorrectly) change the clickable
+ * setting of views off the UI thread. Now that clickable can effect the focusable state,
+ * changing the clickable attribute off the UI thread will cause an exception (since changing
+ * the focusable state checks). In order to prevent apps from crashing, we will handle this
+ * specific case and just not notify parents on new focusables resulting from marking views
+ * clickable from outside the UI thread.
+ */
+ private static boolean sAutoFocusableOffUIThreadWontNotifyParents;
+
/** @hide */
@IntDef({NOT_FOCUSABLE, FOCUSABLE, FOCUSABLE_AUTO})
@Retention(RetentionPolicy.SOURCE)
@@ -4182,6 +4193,8 @@
sHasFocusableExcludeAutoFocusable = targetSdkVersion < Build.VERSION_CODES.O;
+ sAutoFocusableOffUIThreadWontNotifyParents = targetSdkVersion < Build.VERSION_CODES.O;
+
sCompatibilityDone = true;
}
}
@@ -12135,6 +12148,7 @@
int privateFlags = mPrivateFlags;
// If focusable is auto, update the FOCUSABLE bit.
+ int focusableChangedByAuto = 0;
if (((mViewFlags & FOCUSABLE_AUTO) != 0)
&& (changed & (FOCUSABLE_MASK | CLICKABLE | FOCUSABLE_IN_TOUCH_MODE)) != 0) {
int newFocus = NOT_FOCUSABLE;
@@ -12144,8 +12158,8 @@
mViewFlags = (mViewFlags & ~FOCUSABLE_IN_TOUCH_MODE);
}
mViewFlags = (mViewFlags & ~FOCUSABLE) | newFocus;
- int focusChanged = (old & FOCUSABLE) ^ (newFocus & FOCUSABLE);
- changed = (changed & ~FOCUSABLE) | focusChanged;
+ focusableChangedByAuto = (old & FOCUSABLE) ^ (newFocus & FOCUSABLE);
+ changed = (changed & ~FOCUSABLE) | focusableChangedByAuto;
}
/* Check if the FOCUSABLE bit has changed */
@@ -12160,7 +12174,15 @@
* Tell the view system that we are now available to take focus
* if no one else already has it.
*/
- if (mParent != null) mParent.focusableViewAvailable(this);
+ if (mParent != null) {
+ ViewRootImpl viewRootImpl = getViewRootImpl();
+ if (!sAutoFocusableOffUIThreadWontNotifyParents
+ || focusableChangedByAuto == 0
+ || viewRootImpl == null
+ || viewRootImpl.mThread == Thread.currentThread()) {
+ mParent.focusableViewAvailable(this);
+ }
+ }
}
}
diff --git a/core/java/android/view/accessibility/AccessibilityNodeInfo.java b/core/java/android/view/accessibility/AccessibilityNodeInfo.java
index b0a11cd..67d7ff8 100644
--- a/core/java/android/view/accessibility/AccessibilityNodeInfo.java
+++ b/core/java/android/view/accessibility/AccessibilityNodeInfo.java
@@ -3315,6 +3315,7 @@
mBoundsInScreen.set(0, 0, 0, 0);
mBooleanProperties = 0;
mDrawingOrderInParent = 0;
+ mExtraDataKeys = null;
mPackageName = null;
mClassName = null;
mText = null;
diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java
index 8d31990..a72b66a 100644
--- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -131,6 +131,9 @@
Trace.traceBegin(Trace.TRACE_TAG_DALVIK, "PreloadOpenGL");
preloadOpenGL();
Trace.traceEnd(Trace.TRACE_TAG_DALVIK);
+ Trace.traceBegin(Trace.TRACE_TAG_DALVIK, "PreloadOpenGL");
+ preloadOpenGL();
+ Trace.traceEnd(Trace.TRACE_TAG_DALVIK);
preloadSharedLibraries();
preloadTextResources();
// Ask the WebViewFactory to do any initialization that must run in the zygote process,
diff --git a/core/java/com/android/internal/view/InputMethodClient.java b/core/java/com/android/internal/view/InputMethodClient.java
index 802ce3e..cea030a 100644
--- a/core/java/com/android/internal/view/InputMethodClient.java
+++ b/core/java/com/android/internal/view/InputMethodClient.java
@@ -75,12 +75,12 @@
public static final int UNBIND_REASON_DISCONNECT_IME = 3;
public static final int UNBIND_REASON_NO_IME = 4;
public static final int UNBIND_REASON_SWITCH_IME_FAILED = 5;
- public static final int UNBIND_REASON_RESET_IME = 6;
+ public static final int UNBIND_REASON_SWITCH_USER = 6;
@Retention(SOURCE)
@IntDef({UNBIND_REASON_UNSPECIFIED, UNBIND_REASON_SWITCH_CLIENT, UNBIND_REASON_SWITCH_IME,
UNBIND_REASON_DISCONNECT_IME, UNBIND_REASON_NO_IME, UNBIND_REASON_SWITCH_IME_FAILED,
- UNBIND_REASON_RESET_IME})
+ UNBIND_REASON_SWITCH_USER})
public @interface UnbindReason {}
public static String getUnbindReason(@UnbindReason final int reason) {
@@ -97,8 +97,8 @@
return "NO_IME";
case UNBIND_REASON_SWITCH_IME_FAILED:
return "SWITCH_IME_FAILED";
- case UNBIND_REASON_RESET_IME:
- return "RESET_IME";
+ case UNBIND_REASON_SWITCH_USER:
+ return "SWITCH_USER";
default:
return "Unknown=" + reason;
}
diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index dd2f365..0c07192 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -283,6 +283,7 @@
libhidlbase \
libhidltransport \
libhwbinder \
+ libvintf \
LOCAL_SHARED_LIBRARIES += \
libhwui \
diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp
index 2bde991..3ca455d 100755
--- a/core/jni/android/graphics/Bitmap.cpp
+++ b/core/jni/android/graphics/Bitmap.cpp
@@ -876,9 +876,9 @@
sk_sp<SkColorSpace> colorSpace;
if (kRGBA_F16_SkColorType == colorType) {
- colorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGBLinear_Named);
+ colorSpace = SkColorSpace::MakeSRGBLinear();
} else {
- colorSpace = isSRGB ? SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named) : nullptr;
+ colorSpace = isSRGB ? SkColorSpace::MakeSRGB() : nullptr;
}
if (!bitmap->setInfo(SkImageInfo::Make(width, height, colorType, alphaType, colorSpace),
@@ -997,7 +997,7 @@
auto bitmapWrapper = reinterpret_cast<BitmapWrapper*>(bitmapHandle);
bitmapWrapper->getSkBitmap(&bitmap);
- sk_sp<SkColorSpace> sRGB = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);
+ sk_sp<SkColorSpace> sRGB = SkColorSpace::MakeSRGB();
bool isSRGB = bitmap.colorSpace() == sRGB.get();
p->writeInt32(isMutable);
diff --git a/core/jni/android/graphics/BitmapFactory.cpp b/core/jni/android/graphics/BitmapFactory.cpp
index 19d4848..2aa16b2 100644
--- a/core/jni/android/graphics/BitmapFactory.cpp
+++ b/core/jni/android/graphics/BitmapFactory.cpp
@@ -39,6 +39,7 @@
jfieldID gOptions_widthFieldID;
jfieldID gOptions_heightFieldID;
jfieldID gOptions_mimeFieldID;
+jfieldID gOptions_outConfigFieldID;
jfieldID gOptions_mCancelID;
jfieldID gOptions_bitmapFieldID;
@@ -47,6 +48,9 @@
jclass gInsetStruct_class;
jmethodID gInsetStruct_constructorMethodID;
+jclass gBitmapConfig_class;
+jmethodID gBitmapConfig_nativeToConfigMethodID;
+
using namespace android;
jstring encodedFormatToString(JNIEnv* env, SkEncodedImageFormat format) {
@@ -298,6 +302,7 @@
env->SetIntField(options, gOptions_widthFieldID, -1);
env->SetIntField(options, gOptions_heightFieldID, -1);
env->SetObjectField(options, gOptions_mimeFieldID, 0);
+ env->SetObjectField(options, gOptions_outConfigFieldID, 0);
jobject jconfig = env->GetObjectField(options, gOptions_configFieldID);
prefColorType = GraphicsJNI::getNativeBitmapColorType(env, jconfig);
@@ -352,6 +357,9 @@
scaledHeight = codec->getInfo().height() / sampleSize;
}
+ // Set the decode colorType
+ SkColorType decodeColorType = codec->computeOutputColorType(prefColorType);
+
// Set the options and return if the client only wants the size.
if (options != NULL) {
jstring mimeType = encodedFormatToString(
@@ -363,6 +371,20 @@
env->SetIntField(options, gOptions_heightFieldID, scaledHeight);
env->SetObjectField(options, gOptions_mimeFieldID, mimeType);
+ SkColorType outColorType = decodeColorType;
+ // Scaling can affect the output color type
+ if (willScale || scale != 1.0f) {
+ outColorType = colorTypeForScaledOutput(outColorType);
+ }
+
+ jint configID = GraphicsJNI::colorTypeToLegacyBitmapConfig(outColorType);
+ if (isHardware) {
+ configID = GraphicsJNI::kHardware_LegacyBitmapConfig;
+ }
+ jobject config = env->CallStaticObjectMethod(gBitmapConfig_class,
+ gBitmapConfig_nativeToConfigMethodID, configID);
+ env->SetObjectField(options, gOptions_outConfigFieldID, config);
+
if (onlyDecodeSize) {
return nullptr;
}
@@ -409,10 +431,6 @@
decodeAllocator = &defaultAllocator;
}
- // Set the decode colorType. This is necessary because we can't always support
- // the requested colorType.
- SkColorType decodeColorType = codec->computeOutputColorType(prefColorType);
-
// Construct a color table for the decode if necessary
sk_sp<SkColorTable> colorTable(nullptr);
SkPMColor* colorPtr = nullptr;
@@ -747,6 +765,8 @@
gOptions_widthFieldID = GetFieldIDOrDie(env, options_class, "outWidth", "I");
gOptions_heightFieldID = GetFieldIDOrDie(env, options_class, "outHeight", "I");
gOptions_mimeFieldID = GetFieldIDOrDie(env, options_class, "outMimeType", "Ljava/lang/String;");
+ gOptions_outConfigFieldID = GetFieldIDOrDie(env, options_class, "outConfig",
+ "Landroid/graphics/Bitmap$Config;");
gOptions_mCancelID = GetFieldIDOrDie(env, options_class, "mCancel", "Z");
jclass bitmap_class = FindClassOrDie(env, "android/graphics/Bitmap");
@@ -758,6 +778,11 @@
gInsetStruct_constructorMethodID = GetMethodIDOrDie(env, gInsetStruct_class, "<init>",
"(IIIIIIIIFIF)V");
+ gBitmapConfig_class = MakeGlobalRefOrDie(env, FindClassOrDie(env,
+ "android/graphics/Bitmap$Config"));
+ gBitmapConfig_nativeToConfigMethodID = GetStaticMethodIDOrDie(env, gBitmapConfig_class,
+ "nativeToConfig", "(I)Landroid/graphics/Bitmap$Config;");
+
return android::RegisterMethodsOrDie(env, "android/graphics/BitmapFactory",
gMethods, NELEM(gMethods));
}
diff --git a/core/jni/android/graphics/Graphics.cpp b/core/jni/android/graphics/Graphics.cpp
index d5f33cf..5d73101 100644
--- a/core/jni/android/graphics/Graphics.cpp
+++ b/core/jni/android/graphics/Graphics.cpp
@@ -287,21 +287,7 @@
env->SetFloatField(obj, gPointF_yFieldID, SkScalarToFloat(r.fY));
}
-// This enum must keep these int values, to match the int values
-// in the java Bitmap.Config enum.
-enum LegacyBitmapConfig {
- kNo_LegacyBitmapConfig = 0,
- kA8_LegacyBitmapConfig = 1,
- kIndex8_LegacyBitmapConfig = 2,
- kRGB_565_LegacyBitmapConfig = 3,
- kARGB_4444_LegacyBitmapConfig = 4,
- kARGB_8888_LegacyBitmapConfig = 5,
- kRGBA_16F_LegacyBitmapConfig = 6,
- kHardware_LegacyBitmapConfig = 7,
-
- kLastEnum_LegacyBitmapConfig = kHardware_LegacyBitmapConfig
-};
-
+// See enum values in GraphicsJNI.h
jint GraphicsJNI::colorTypeToLegacyBitmapConfig(SkColorType colorType) {
switch (colorType) {
case kRGBA_F16_SkColorType:
@@ -455,14 +441,14 @@
sk_sp<SkColorSpace> GraphicsJNI::defaultColorSpace() {
#ifdef ANDROID_ENABLE_LINEAR_BLENDING
- return SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);
+ return SkColorSpace::MakeSRGB();
#else
return nullptr;
#endif
}
sk_sp<SkColorSpace> GraphicsJNI::linearColorSpace() {
- return SkColorSpace::MakeNamed(SkColorSpace::kSRGBLinear_Named);
+ return SkColorSpace::MakeSRGBLinear();
}
sk_sp<SkColorSpace> GraphicsJNI::colorSpaceForType(SkColorType type) {
diff --git a/core/jni/android/graphics/GraphicsJNI.h b/core/jni/android/graphics/GraphicsJNI.h
index e899db5..8a1ef6e 100644
--- a/core/jni/android/graphics/GraphicsJNI.h
+++ b/core/jni/android/graphics/GraphicsJNI.h
@@ -24,6 +24,21 @@
class GraphicsJNI {
public:
+ // This enum must keep these int values, to match the int values
+ // in the java Bitmap.Config enum.
+ enum LegacyBitmapConfig {
+ kNo_LegacyBitmapConfig = 0,
+ kA8_LegacyBitmapConfig = 1,
+ kIndex8_LegacyBitmapConfig = 2,
+ kRGB_565_LegacyBitmapConfig = 3,
+ kARGB_4444_LegacyBitmapConfig = 4,
+ kARGB_8888_LegacyBitmapConfig = 5,
+ kRGBA_16F_LegacyBitmapConfig = 6,
+ kHardware_LegacyBitmapConfig = 7,
+
+ kLastEnum_LegacyBitmapConfig = kHardware_LegacyBitmapConfig
+ };
+
// returns true if an exception is set (and dumps it out to the Log)
static bool hasException(JNIEnv*);
diff --git a/core/jni/android_os_HwBinder.cpp b/core/jni/android_os_HwBinder.cpp
index 1f7efa1..989a557 100644
--- a/core/jni/android_os_HwBinder.cpp
+++ b/core/jni/android_os_HwBinder.cpp
@@ -33,6 +33,7 @@
#include <hidl/HidlTransportSupport.h>
#include <hwbinder/ProcessState.h>
#include <nativehelper/ScopedLocalRef.h>
+#include <vintf/parse_string.h>
#include "core_jni_helpers.h"
@@ -156,13 +157,15 @@
if (env->ExceptionCheck()) {
jthrowable excep = env->ExceptionOccurred();
env->ExceptionDescribe();
+ env->ExceptionClear();
+ // It is illegal to call IsInstanceOf if there is a pending exception.
+ // Attempting to do so results in a JniAbort which crashes the entire process.
if (env->IsInstanceOf(excep, gErrorClass)) {
/* It's an error */
LOG(ERROR) << "Forcefully exiting";
exit(1);
} else {
- env->ExceptionClear();
LOG(ERROR) << "Uncaught exception!";
}
@@ -300,6 +303,8 @@
jstring ifaceNameObj,
jstring serviceNameObj) {
+ using ::android::vintf::operator<<;
+
if (ifaceNameObj == NULL) {
jniThrowException(env, "java/lang/NullPointerException", NULL);
return NULL;
@@ -317,27 +322,41 @@
return NULL;
}
- const char *ifaceName = env->GetStringUTFChars(ifaceNameObj, NULL);
- if (ifaceName == NULL) {
+ const char *ifaceNameCStr = env->GetStringUTFChars(ifaceNameObj, NULL);
+ if (ifaceNameCStr == NULL) {
return NULL; // XXX exception already pending?
}
- const char *serviceName = env->GetStringUTFChars(serviceNameObj, NULL);
- if (serviceName == NULL) {
- env->ReleaseStringUTFChars(ifaceNameObj, ifaceName);
+ std::string ifaceName(ifaceNameCStr);
+ env->ReleaseStringUTFChars(ifaceNameObj, ifaceNameCStr);
+ ::android::hardware::hidl_string ifaceNameHStr;
+ ifaceNameHStr.setToExternal(ifaceName.c_str(), ifaceName.size());
+
+ const char *serviceNameCStr = env->GetStringUTFChars(serviceNameObj, NULL);
+ if (serviceNameCStr == NULL) {
return NULL; // XXX exception already pending?
}
+ std::string serviceName(serviceNameCStr);
+ env->ReleaseStringUTFChars(serviceNameObj, serviceNameCStr);
+ ::android::hardware::hidl_string serviceNameHStr;
+ serviceNameHStr.setToExternal(serviceName.c_str(), serviceName.size());
LOG(INFO) << "Looking for service "
<< ifaceName
<< "/"
<< serviceName;
- Return<sp<hidl::base::V1_0::IBase>> ret = manager->get(ifaceName, serviceName);
+ ::android::vintf::Transport transport =
+ ::android::hardware::getTransport(ifaceName);
+ if ( transport != ::android::vintf::Transport::EMPTY
+ && transport != ::android::vintf::Transport::HWBINDER) {
+ LOG(ERROR) << "service " << ifaceName << " declares transport method "
+ << transport << " but framework expects "
+ << ::android::vintf::Transport::HWBINDER;
+ signalExceptionForError(env, UNKNOWN_ERROR, true /* canThrowRemoteException */);
+ return NULL;
+ }
- env->ReleaseStringUTFChars(ifaceNameObj, ifaceName);
- ifaceName = NULL;
- env->ReleaseStringUTFChars(serviceNameObj, serviceName);
- serviceName = NULL;
+ Return<sp<hidl::base::V1_0::IBase>> ret = manager->get(ifaceNameHStr, serviceNameHStr);
if (!ret.isOk()) {
signalExceptionForError(env, UNKNOWN_ERROR, true /* canThrowRemoteException */);
diff --git a/core/jni/android_os_seccomp.cpp b/core/jni/android_os_seccomp.cpp
index 3f021ae..45d5061 100644
--- a/core/jni/android_os_seccomp.cpp
+++ b/core/jni/android_os_seccomp.cpp
@@ -148,7 +148,10 @@
AllowSyscall(f, 128); // __NR_restart_syscall
// b/35034743
- AllowSyscall(f, 267); // __NR_fstatfs64
+ AllowSyscall(f, 267); // __NR_syncfs
+
+ // b/34763393
+ AllowSyscall(f, 277); // __NR_seccomp
Trap(f);
diff --git a/core/jni/android_view_Surface.cpp b/core/jni/android_view_Surface.cpp
index bc5f847..4a9cd24 100644
--- a/core/jni/android_view_Surface.cpp
+++ b/core/jni/android_view_Surface.cpp
@@ -31,6 +31,7 @@
#include <binder/Parcel.h>
#include <gui/Surface.h>
+#include <gui/view/Surface.h>
#include <gui/SurfaceControl.h>
#include <gui/GLConsumer.h>
diff --git a/core/jni/include/android_runtime/android_view_Surface.h b/core/jni/include/android_runtime/android_view_Surface.h
index 1bc8521..07e29cb 100644
--- a/core/jni/include/android_runtime/android_view_Surface.h
+++ b/core/jni/include/android_runtime/android_view_Surface.h
@@ -18,6 +18,7 @@
#define _ANDROID_VIEW_SURFACE_H
#include <android/native_window.h>
+#include <system/graphics.h>
#include "jni.h"
diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml
index 46d0745..34208d1 100644
--- a/core/res/res/values-af/strings.xml
+++ b/core/res/res/values-af/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Kaarte en navigasie"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Produktiwiteit"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Toestelberging"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB-ontfouting"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml
index 45206873..d21e995 100644
--- a/core/res/res/values-am/strings.xml
+++ b/core/res/res/values-am/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"ካርታዎች እና ዳሰሳ"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"ውጤታማነት"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"የመሣሪያ ማከማቻ"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"የዩኤስቢ ማረሚያ"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml
index 95118c2..ef63055 100644
--- a/core/res/res/values-ar/strings.xml
+++ b/core/res/res/values-ar/strings.xml
@@ -1817,6 +1817,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"الخرائط والتنقل"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"الإنتاجية"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"السعة التخزينية للجهاز"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"تصحيح أخطاء USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-az/strings.xml b/core/res/res/values-az/strings.xml
index cf377b2d..13c3622 100644
--- a/core/res/res/values-az/strings.xml
+++ b/core/res/res/values-az/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Xəritə və Naviqasiya"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Məhsuldarlıq"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Cihaz yaddaşı"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB sazlama"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-b+sr+Latn/strings.xml b/core/res/res/values-b+sr+Latn/strings.xml
index e56d938..6413548 100644
--- a/core/res/res/values-b+sr+Latn/strings.xml
+++ b/core/res/res/values-b+sr+Latn/strings.xml
@@ -1724,6 +1724,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Mape i navigacija"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Produktivnost"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Memorijski prostor uređaja"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"Otklanjanje grešaka sa USB-a"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml
index 6383c39..44425a3 100644
--- a/core/res/res/values-be/strings.xml
+++ b/core/res/res/values-be/strings.xml
@@ -1755,6 +1755,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Карты і навігацыя"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Прадукцыйнасць"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Сховішча на прыладзе"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"Адладка USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml
index 1238e2c..6d94928 100644
--- a/core/res/res/values-bg/strings.xml
+++ b/core/res/res/values-bg/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Карти и навигация"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Производителност"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Хранилище на устройството"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"Отстраняване на грешки през USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-bn/strings.xml b/core/res/res/values-bn/strings.xml
index 9bedf58..f0c54c1 100644
--- a/core/res/res/values-bn/strings.xml
+++ b/core/res/res/values-bn/strings.xml
@@ -1694,6 +1694,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"মানচিত্র ও নেভিগেশান"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"উৎপাদনশীলতা"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"ডিভাইসের সঞ্চয়স্থান"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB ডিবাগিং"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-bs/strings.xml b/core/res/res/values-bs/strings.xml
index 66ef19a..34efe51 100644
--- a/core/res/res/values-bs/strings.xml
+++ b/core/res/res/values-bs/strings.xml
@@ -1727,6 +1727,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Mape i navigacija"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Produktivnost"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Memorija uređaja"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"Otklanjanje grešaka putem uređaja spojenog na USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml
index b01f382..f501f70 100644
--- a/core/res/res/values-ca/strings.xml
+++ b/core/res/res/values-ca/strings.xml
@@ -278,7 +278,7 @@
<string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Controla el nivell i el posicionament del zoom de la pantalla."</string>
<string name="capability_title_canPerformGestures" msgid="7418984730362576862">"Utilitza gestos"</string>
<string name="capability_desc_canPerformGestures" msgid="8296373021636981249">"Pot tocar, lliscar, pessigar i utilitzar altres gestos."</string>
- <string name="capability_title_canCaptureFingerprintGestures" msgid="6309568287512278670">"Gestos amb les empremtes digitals"</string>
+ <string name="capability_title_canCaptureFingerprintGestures" msgid="6309568287512278670">"Gestos al sensor d\'empremtes digitals"</string>
<string name="capability_desc_canCaptureFingerprintGestures" msgid="7102111919385702482">"Captura gestos realitzats en el sensor d\'empremtes digitals del dispositiu."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"desactivar o modificar la barra d\'estat"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Permet que l\'aplicació desactivi la barra d\'estat o afegeixi i elimini icones del sistema."</string>
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Mapes i navegació"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Productivitat"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Emmagatzematge del dispositiu"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"Depuració USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml
index b8717d5..66e8512 100644
--- a/core/res/res/values-cs/strings.xml
+++ b/core/res/res/values-cs/strings.xml
@@ -1755,6 +1755,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Mapy a navigace"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Produktivita"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Úložiště zařízení"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"Ladění USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml
index ebcd48e..1c0d86c 100644
--- a/core/res/res/values-da/strings.xml
+++ b/core/res/res/values-da/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Kort og navigation"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Produktivitet"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Lagerplads på enheden"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB-fejlretning"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml
index 7e31748..8e3fda0 100644
--- a/core/res/res/values-de/strings.xml
+++ b/core/res/res/values-de/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Karten & Navigation"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Effizienz"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Gerätespeicher"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB-Fehlerbehebung"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml
index 7458e04..eeb9e32 100644
--- a/core/res/res/values-el/strings.xml
+++ b/core/res/res/values-el/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Χάρτες και πλοήγηση"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Παραγωγικότητα"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Αποθηκευτικός χώρος συσκευής"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"Εντοπισμός σφαλμάτων USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml
index 107f247..8c4e7855 100644
--- a/core/res/res/values-en-rAU/strings.xml
+++ b/core/res/res/values-en-rAU/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Maps & Navigation"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Productivity"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Device storage"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB debugging"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml
index 107f247..8c4e7855 100644
--- a/core/res/res/values-en-rGB/strings.xml
+++ b/core/res/res/values-en-rGB/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Maps & Navigation"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Productivity"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Device storage"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB debugging"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml
index 107f247..8c4e7855 100644
--- a/core/res/res/values-en-rIN/strings.xml
+++ b/core/res/res/values-en-rIN/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Maps & Navigation"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Productivity"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Device storage"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB debugging"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml
index 2749b35..cb4ecac 100644
--- a/core/res/res/values-es-rUS/strings.xml
+++ b/core/res/res/values-es-rUS/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Mapas y navegación"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Productividad"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Almacenamiento del dispositivo"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"Depuración por USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml
index bdb1381..9f8615b 100644
--- a/core/res/res/values-es/strings.xml
+++ b/core/res/res/values-es/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Mapas y navegación"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Productividad"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Almacenamiento del dispositivo"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"Depuración por USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml
index 5b532b4..acaa751 100644
--- a/core/res/res/values-et/strings.xml
+++ b/core/res/res/values-et/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Kaardid ja navigeerimine"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Produktiivsus"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Seadme salvestusruum"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB silumine"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-eu/strings.xml b/core/res/res/values-eu/strings.xml
index afb0a9c..6d5c776 100644
--- a/core/res/res/values-eu/strings.xml
+++ b/core/res/res/values-eu/strings.xml
@@ -1694,6 +1694,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Mapak eta nabigazioa"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Produktibitatea"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Gailuaren memoria"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB arazketa"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml
index 1e1c8fa..b6d5424 100644
--- a/core/res/res/values-fa/strings.xml
+++ b/core/res/res/values-fa/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"نقشه و پیمایش"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"بهرهوری"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"حافظه دستگاه"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"اشکالزدایی USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml
index c3c2c65..409a13d 100644
--- a/core/res/res/values-fi/strings.xml
+++ b/core/res/res/values-fi/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Kartat ja navigointi"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Tuottavuus"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Laitteen tallennustila"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB-vianetsintä"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml
index 7e051c9..8541512 100644
--- a/core/res/res/values-fr-rCA/strings.xml
+++ b/core/res/res/values-fr-rCA/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Cartes et navigation"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Productivité"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Mémoire de l\'appareil"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"Débogage USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml
index b8fcf28..e956d9a 100644
--- a/core/res/res/values-fr/strings.xml
+++ b/core/res/res/values-fr/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Plans et navigation"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Productivité"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Mémoire de l\'appareil"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"Débogage USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-gl/strings.xml b/core/res/res/values-gl/strings.xml
index 5d316f6..7cdeb06 100644
--- a/core/res/res/values-gl/strings.xml
+++ b/core/res/res/values-gl/strings.xml
@@ -1694,6 +1694,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Mapas e navegación"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Produtividade"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Almacenamento do dispositivo"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"Depuración de USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-gu/strings.xml b/core/res/res/values-gu/strings.xml
index b5c243b..e64f56a 100644
--- a/core/res/res/values-gu/strings.xml
+++ b/core/res/res/values-gu/strings.xml
@@ -278,8 +278,8 @@
<string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"પ્રદર્શનનું ઝૂમ સ્તર અને સ્થિતિનિર્ધારણ નિયંત્રિત કરો."</string>
<string name="capability_title_canPerformGestures" msgid="7418984730362576862">"હાવભાવ કરો"</string>
<string name="capability_desc_canPerformGestures" msgid="8296373021636981249">"ટૅપ, સ્વાઇપ, પિંચ કરી અને અન્ય હાવભાવ કરી શકે છે."</string>
- <string name="capability_title_canCaptureFingerprintGestures" msgid="6309568287512278670">"ફિંગરપ્રિન્ટ હાવભાવો"</string>
- <string name="capability_desc_canCaptureFingerprintGestures" msgid="7102111919385702482">"ઉપકરણોનાં ફિંગરપ્રિન્ટ સેન્સર પર ભજવેલા હાવભાવ કૅપ્ચર કરી શકે છે."</string>
+ <string name="capability_title_canCaptureFingerprintGestures" msgid="6309568287512278670">"ફિંગરપ્રિન્ટ સંકેતો"</string>
+ <string name="capability_desc_canCaptureFingerprintGestures" msgid="7102111919385702482">"ઉપકરણોનાં ફિંગરપ્રિન્ટ સેન્સર પર ભજવેલા સંકેતો કૅપ્ચર કરી શકે છે."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"સ્થિતિ બાર અક્ષમ કરો અથવા સંશોધિત કરો"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"એપ્લિકેશનને સ્થિતિ બાર અક્ષમ કરવાની અથવા સિસ્ટમ આયકન્સ ઉમેરવા અને દૂર કરવાની મંજૂરી આપે છે."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"સ્થિતિ બાર થાઓ"</string>
@@ -1694,6 +1694,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"નકશા અને નેવિગેશન"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"ઉત્પાદકતા"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"ઉપકરણ સ્ટૉરેજ"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB ડિબગિંગ"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml
index f2c3d43..04a5e5e 100644
--- a/core/res/res/values-hi/strings.xml
+++ b/core/res/res/values-hi/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"मानचित्र और मार्गदर्शक"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"उत्पादकता"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"डिवाइस में जगह"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB डीबग करना"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml
index 11864c6..2a6696c 100644
--- a/core/res/res/values-hr/strings.xml
+++ b/core/res/res/values-hr/strings.xml
@@ -1724,6 +1724,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Karte i navigacija"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Produktivnost"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Pohrana na uređaju"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"Otklanjanje pogrešaka putem USB-a"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml
index 4c6d440..64cec19 100644
--- a/core/res/res/values-hu/strings.xml
+++ b/core/res/res/values-hu/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Térképek és navigáció"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Irodai alkalmazások"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Eszköztárhely"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB-hibakeresés"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-hy/strings.xml b/core/res/res/values-hy/strings.xml
index 276a326..d645ee0 100644
--- a/core/res/res/values-hy/strings.xml
+++ b/core/res/res/values-hy/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Քարտեզներ և նավարկում"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Աշխատանք"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Սարքի հիշողություն"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB վրիպազերծում"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml
index 839fc04..2f4f501 100644
--- a/core/res/res/values-in/strings.xml
+++ b/core/res/res/values-in/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Peta & Navigasi"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Produktivitas"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Penyimpanan perangkat"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"Proses debug USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-is/strings.xml b/core/res/res/values-is/strings.xml
index 1e2beb0..997eb5f 100644
--- a/core/res/res/values-is/strings.xml
+++ b/core/res/res/values-is/strings.xml
@@ -1694,6 +1694,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Kort og leiðsögn"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Aðstoð"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Geymslurými tækis"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB-villuleit"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml
index 0b7820e..81006b0 100644
--- a/core/res/res/values-it/strings.xml
+++ b/core/res/res/values-it/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Maps e Navigatore"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Produttività"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Memoria dispositivo"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"Debug USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml
index 4361ff2..3b3260a 100644
--- a/core/res/res/values-iw/strings.xml
+++ b/core/res/res/values-iw/strings.xml
@@ -1755,6 +1755,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"מפות וניווט"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"פרודוקטיביות"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"שטח האחסון במכשיר"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"ניקוי באגים ב-USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml
index f3a22ce..48c1fbc 100644
--- a/core/res/res/values-ja/strings.xml
+++ b/core/res/res/values-ja/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"地図＆ナビ"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"仕事効率化"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"端末のストレージ"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB デバッグ"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-ka/strings.xml b/core/res/res/values-ka/strings.xml
index 9d3b288..0da158d 100644
--- a/core/res/res/values-ka/strings.xml
+++ b/core/res/res/values-ka/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"რუკები და ნავიგაცია"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"პროდუქტიულობა"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"მოწყობილობის მეხსიერება"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB გამართვა"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-kk/strings.xml b/core/res/res/values-kk/strings.xml
index b168b6f..370e42c 100644
--- a/core/res/res/values-kk/strings.xml
+++ b/core/res/res/values-kk/strings.xml
@@ -1694,6 +1694,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Карта және навигация"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Өнімділік"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Құрылғы жады"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB арқылы жөндеу"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-km/strings.xml b/core/res/res/values-km/strings.xml
index 0a57834..ea404bb 100644
--- a/core/res/res/values-km/strings.xml
+++ b/core/res/res/values-km/strings.xml
@@ -1695,6 +1695,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"ផែនទី និងការរុករក"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"ផលិតភាព"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"ទំហំផ្ទុកឧបករណ៍"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"ការកែកំហុស USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-kn/strings.xml b/core/res/res/values-kn/strings.xml
index 07400f5..1dc8a32 100644
--- a/core/res/res/values-kn/strings.xml
+++ b/core/res/res/values-kn/strings.xml
@@ -1694,6 +1694,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"ನಕ್ಷೆಗಳು ಮತ್ತು ನ್ಯಾವಿಗೇಶನ್"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"ಉತ್ಪಾದಕತೆ"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"ಸಾಧನ ಸಂಗ್ರಹಣೆ"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB ಡೀಬಗ್ ಮಾಡುವಿಕೆ"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml
index b74094e..605cff7 100644
--- a/core/res/res/values-ko/strings.xml
+++ b/core/res/res/values-ko/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"지도/내비게이션"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"생산성"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"기기 저장용량"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB 디버깅"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-ky/strings.xml b/core/res/res/values-ky/strings.xml
index 7b1d126..4b2f536 100644
--- a/core/res/res/values-ky/strings.xml
+++ b/core/res/res/values-ky/strings.xml
@@ -1694,6 +1694,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Карталар жана чабыттоо"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Өндүрүш категориясы"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Түзмөктүн сактагычы"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB аркылуу мүчүлүштүктөрдү оңдоо"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-lo/strings.xml b/core/res/res/values-lo/strings.xml
index 5d7b4c3..4c9a059 100644
--- a/core/res/res/values-lo/strings.xml
+++ b/core/res/res/values-lo/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Maps & Navigation"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"ຜະລິດຕະພາບ"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"ບ່ອນຈັດເກັບຂໍ້ມູນອຸປະກອນ"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"ການດີບັ໊ກຜ່ານ USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml
index 89ac3f2..90c1618 100644
--- a/core/res/res/values-lt/strings.xml
+++ b/core/res/res/values-lt/strings.xml
@@ -1755,6 +1755,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Žemėlapiai ir navigacija"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Produktyvumas"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Įrenginio saugykla"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB derinimas"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml
index 5163334..ec664f2 100644
--- a/core/res/res/values-lv/strings.xml
+++ b/core/res/res/values-lv/strings.xml
@@ -1724,6 +1724,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Kartes un navigācija"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Produktivitāte"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Ierīces krātuve"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB atkļūdošana"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-mk/strings.xml b/core/res/res/values-mk/strings.xml
index 66d5387..4c9ea72 100644
--- a/core/res/res/values-mk/strings.xml
+++ b/core/res/res/values-mk/strings.xml
@@ -1696,6 +1696,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Карти и навигација"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Продуктивност"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Простор на уредот"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"Отстранување грешки на USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-ml/strings.xml b/core/res/res/values-ml/strings.xml
index bb5455d..57a4a2d 100644
--- a/core/res/res/values-ml/strings.xml
+++ b/core/res/res/values-ml/strings.xml
@@ -1694,6 +1694,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"മാപ്സും നാവിഗേഷനും"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"ഉല്പ്പാദനക്ഷമത"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"ഉപകരണ സ്റ്റോറേജ്"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB ഡീബഗ്ഗിംഗ്"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-mn/strings.xml b/core/res/res/values-mn/strings.xml
index 0f7d43a..c154c65 100644
--- a/core/res/res/values-mn/strings.xml
+++ b/core/res/res/values-mn/strings.xml
@@ -1691,6 +1691,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Газрын зураг & зүг чиг"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Бүтээмж"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Төхөөрөмжийн сан"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB дебаг хийлт"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-mr/strings.xml b/core/res/res/values-mr/strings.xml
index 69cf831..4a58c41 100644
--- a/core/res/res/values-mr/strings.xml
+++ b/core/res/res/values-mr/strings.xml
@@ -1696,4 +1696,18 @@
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"डिव्हाइस संचय"</string>
<!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
<skip />
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml
index ad053b9..9fdad6e 100644
--- a/core/res/res/values-ms/strings.xml
+++ b/core/res/res/values-ms/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Peta & Navigasi"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Produktiviti"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Storan peranti"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"Penyahpepijatan USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-my/strings.xml b/core/res/res/values-my/strings.xml
index 4454c2b5..5a60b8e 100644
--- a/core/res/res/values-my/strings.xml
+++ b/core/res/res/values-my/strings.xml
@@ -1694,6 +1694,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"မြေပုံနှင့် ခရီးလမ်းညွှန်ချက်"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"ထုတ်လုပ်နိုင်မှု"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"စက်ပစ္စည်း သိုလှောင်ခန်း"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB အမှားရှာပြင်ခြင်း"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml
index d23441f..7c23db4 100644
--- a/core/res/res/values-nb/strings.xml
+++ b/core/res/res/values-nb/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Kart og navigering"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Produktivitet"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Lagring på enheten"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB-feilsøking"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-ne/strings.xml b/core/res/res/values-ne/strings.xml
index d513ff3..92190ef 100644
--- a/core/res/res/values-ne/strings.xml
+++ b/core/res/res/values-ne/strings.xml
@@ -1699,6 +1699,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"नक्सा तथा नेभिगेसन"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"उत्पादकत्व"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"यन्त्रको भण्डारण"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB डिबग प्रक्रिया"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml
index f3e0274..83b1c93 100644
--- a/core/res/res/values-nl/strings.xml
+++ b/core/res/res/values-nl/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Maps en navigatie"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Productiviteit"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Apparaatopslag"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB-foutopsporing"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-pa/strings.xml b/core/res/res/values-pa/strings.xml
index 788efb8..5ce692e 100644
--- a/core/res/res/values-pa/strings.xml
+++ b/core/res/res/values-pa/strings.xml
@@ -1694,6 +1694,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"ਨਕਸ਼ੇ ਅਤੇ ਆਵਾਗੌਣ"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"ਉਤਪਾਦਕਤਾ"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"ਡੀਵਾਈਸ ਸਟੋਰੇਜ"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB ਡੀਬੱਗਿੰਗ"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml
index 3814f80..180ae57 100644
--- a/core/res/res/values-pl/strings.xml
+++ b/core/res/res/values-pl/strings.xml
@@ -1755,6 +1755,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Mapy i nawigacja"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Produktywność"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Pamięć urządzenia"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"Debugowanie USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-pt-rBR/strings.xml b/core/res/res/values-pt-rBR/strings.xml
index a7a763f..ecf2029 100644
--- a/core/res/res/values-pt-rBR/strings.xml
+++ b/core/res/res/values-pt-rBR/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Mapas e navegação"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Produtividade"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Armazenamento do dispositivo"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"Depuração USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml
index b87fe9e..67246db 100644
--- a/core/res/res/values-pt-rPT/strings.xml
+++ b/core/res/res/values-pt-rPT/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Mapas e navegação"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Produtividade"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Armazenamento do dispositivo"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"Depuração USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml
index a7a763f..ecf2029 100644
--- a/core/res/res/values-pt/strings.xml
+++ b/core/res/res/values-pt/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Mapas e navegação"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Produtividade"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Armazenamento do dispositivo"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"Depuração USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml
index b407ae0..0819b39 100644
--- a/core/res/res/values-ro/strings.xml
+++ b/core/res/res/values-ro/strings.xml
@@ -1724,6 +1724,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Hărți și navigare"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Productivitate"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Stocare pe dispozitiv"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"Remedierea erorilor prin USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml
index 2e2bd0b..f2c693e 100644
--- a/core/res/res/values-ru/strings.xml
+++ b/core/res/res/values-ru/strings.xml
@@ -1755,6 +1755,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Карты и навигация"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Работа"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Хранилище устройства"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"Отладка по USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-si/strings.xml b/core/res/res/values-si/strings.xml
index 7440888..17f3b1e 100644
--- a/core/res/res/values-si/strings.xml
+++ b/core/res/res/values-si/strings.xml
@@ -1091,9 +1091,9 @@
<string name="wifi_connect_alert_title" msgid="8455846016001810172">"සම්බන්ධතාවයට ඉඩ දෙන්නද?"</string>
<string name="wifi_connect_alert_message" msgid="6451273376815958922">"යෙදුම් %1$s ක් WiFi ජාලය %2$s වෙත සම්බන්ධ කිරීමට කැමතියි"</string>
<string name="wifi_connect_default_application" msgid="7143109390475484319">"යෙදුම"</string>
- <string name="wifi_p2p_dialog_title" msgid="97611782659324517">"ඍජු Wi-Fi"</string>
- <string name="wifi_p2p_turnon_message" msgid="2909250942299627244">"ඍජු Wi-Fi ආරම්භ කරන්න. මෙය Wi-Fi සේවාදායක/හොට්ස්පොට් එක අක්රිය කරනු ඇත."</string>
- <string name="wifi_p2p_failed_message" msgid="3763669677935623084">"ඍජු Wi-Fi ආරම්භ කළ නොහැක."</string>
+ <string name="wifi_p2p_dialog_title" msgid="97611782659324517">"Wi-Fi Direct"</string>
+ <string name="wifi_p2p_turnon_message" msgid="2909250942299627244">"Wi-Fi Direct ආරම්භ කරන්න. මෙය Wi-Fi සේවාදායක/හොට්ස්පොට් එක අක්රිය කරනු ඇත."</string>
+ <string name="wifi_p2p_failed_message" msgid="3763669677935623084">"Wi-Fi Direct ආරම්භ කළ නොහැක."</string>
<string name="wifi_p2p_enabled_notification_title" msgid="2068321881673734886">"Wi-Fi Direct ක්රියාත්මකයි"</string>
<string name="wifi_p2p_enabled_notification_message" msgid="8064677407830620023">"සැකසීම් සඳහා තට්ටු කරන්න"</string>
<string name="accept" msgid="1645267259272829559">"පිළිගන්න"</string>
@@ -1695,6 +1695,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"සිතියම් සහ සංචලනය"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"ඵලදායිතාව"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"උපාංග ගබඩාව"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB නිදොස්කරණය"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml
index 47716da..d04636f 100644
--- a/core/res/res/values-sk/strings.xml
+++ b/core/res/res/values-sk/strings.xml
@@ -1755,6 +1755,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Mapy a navigácia"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Produktivita"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Úložisko zariadenia"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"Ladenie cez USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml
index 13102b5..d513862 100644
--- a/core/res/res/values-sl/strings.xml
+++ b/core/res/res/values-sl/strings.xml
@@ -1755,6 +1755,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Zemljevidi in navigacija"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Storilnost"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Shramba naprave"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"Odpravljanje težav prek povezave USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-sq/strings.xml b/core/res/res/values-sq/strings.xml
index fd76f7d..7d5d277 100644
--- a/core/res/res/values-sq/strings.xml
+++ b/core/res/res/values-sq/strings.xml
@@ -1694,6 +1694,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Harta dhe navigim"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Produktivitet"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Hapësira ruajtëse e pajisjes"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"Korrigjimi i USB-së"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml
index 54b0fae..962c6f8 100644
--- a/core/res/res/values-sr/strings.xml
+++ b/core/res/res/values-sr/strings.xml
@@ -1724,6 +1724,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Мапе и навигација"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Продуктивност"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Меморијски простор уређаја"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"Отклањање грешака са USB-а"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml
index e010b96..6f3fbda 100644
--- a/core/res/res/values-sv/strings.xml
+++ b/core/res/res/values-sv/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Kartor och navigation"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Produktivitet"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Enhetens lagringsutrymme"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB-felsökning"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml
index c363a2216..fc48ab6 100644
--- a/core/res/res/values-sw/strings.xml
+++ b/core/res/res/values-sw/strings.xml
@@ -1691,6 +1691,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Ramani na Maelekezo"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Uzalishaji"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Hifadhi ya kifaa"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"Utatuzi wa USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-ta/strings.xml b/core/res/res/values-ta/strings.xml
index 8a70c4e..638f7a4 100644
--- a/core/res/res/values-ta/strings.xml
+++ b/core/res/res/values-ta/strings.xml
@@ -1694,6 +1694,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"வரைபடங்களும் வழிசெலுத்தலும்"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"உற்பத்தித்திறன்"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"சாதனச் சேமிப்பகம்"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB பிழைத்திருத்தம்"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-te/strings.xml b/core/res/res/values-te/strings.xml
index 4d22092..d5f1433 100644
--- a/core/res/res/values-te/strings.xml
+++ b/core/res/res/values-te/strings.xml
@@ -1694,6 +1694,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"మ్యాప్స్ & నావిగేషన్"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"ఉత్పాదకత"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"పరికర నిల్వ"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB డీబగ్గింగ్"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml
index 38dfd84..deec6f6 100644
--- a/core/res/res/values-th/strings.xml
+++ b/core/res/res/values-th/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"แผนที่และการนำทาง"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"ประสิทธิภาพการทำงาน"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"พื้นที่เก็บข้อมูลของอุปกรณ์"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"การแก้ไขข้อบกพร่อง USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml
index 06c6aa7..499fa64 100644
--- a/core/res/res/values-tl/strings.xml
+++ b/core/res/res/values-tl/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Mga Mapa at Navigation"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Productivity"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Storage ng device"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"Pag-debug ng USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml
index c6dd402..b9dd30b 100644
--- a/core/res/res/values-tr/strings.xml
+++ b/core/res/res/values-tr/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Haritalar ve Navigasyon"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Verimlilik"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Cihazdaki depolama alanı"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB üzerinden hata ayıklama"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml
index 6b5070a..6ef561c 100644
--- a/core/res/res/values-uk/strings.xml
+++ b/core/res/res/values-uk/strings.xml
@@ -1362,7 +1362,7 @@
<string name="keyboard_password_character_no_headset" msgid="2859873770886153678">"Крапка."</string>
<string name="action_bar_home_description" msgid="5293600496601490216">"Перейти на головну"</string>
<string name="action_bar_up_description" msgid="2237496562952152589">"Перейти вгору"</string>
- <string name="action_menu_overflow_description" msgid="2295659037509008453">"Інші варіанти"</string>
+ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Більше"</string>
<string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string>
<string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string>
<string name="storage_internal" msgid="3570990907910199483">"Внутрішнє спільне сховище"</string>
@@ -1755,6 +1755,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Карти й навігація"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Продуктивність"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Пам’ять пристрою"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"Налагодження USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-ur/strings.xml b/core/res/res/values-ur/strings.xml
index 9f77dbb..95b47cd 100644
--- a/core/res/res/values-ur/strings.xml
+++ b/core/res/res/values-ur/strings.xml
@@ -1696,4 +1696,18 @@
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"آلہ کی اسٹوریج"</string>
<!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
<skip />
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
+ <skip />
</resources>
diff --git a/core/res/res/values-uz/strings.xml b/core/res/res/values-uz/strings.xml
index 6f07869..8ed7b7a 100644
--- a/core/res/res/values-uz/strings.xml
+++ b/core/res/res/values-uz/strings.xml
@@ -1694,6 +1694,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Xaritalar va navigatsiya"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Ish va unumdorlik"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Qurilma xotirasi"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB orqali nosozliklarni tuzatish"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml
index f2d9c8f..40994cb 100644
--- a/core/res/res/values-vi/strings.xml
+++ b/core/res/res/values-vi/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Bản đồ và dẫn đường"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Sản xuất"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Bộ nhớ của thiết bị"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"Gỡ lỗi USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml
index 96eba47..af155e2 100644
--- a/core/res/res/values-zh-rCN/strings.xml
+++ b/core/res/res/values-zh-rCN/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"地图和导航"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"办公"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"设备存储空间"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB 调试"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml
index 234d45b..02abba7 100644
--- a/core/res/res/values-zh-rHK/strings.xml
+++ b/core/res/res/values-zh-rHK/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"地圖和導航"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"生產力應用程式"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"裝置儲存空間"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB 偵錯"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml
index 0f0f176..1e45412 100644
--- a/core/res/res/values-zh-rTW/strings.xml
+++ b/core/res/res/values-zh-rTW/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"地圖和導航"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"生產應用"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"裝置儲存空間"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB 偵錯"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml
index 938b332..8016ed8 100644
--- a/core/res/res/values-zu/strings.xml
+++ b/core/res/res/values-zu/strings.xml
@@ -1693,6 +1693,19 @@
<string name="app_category_maps" msgid="5878491404538024367">"Amamephu nokuzula"</string>
<string name="app_category_productivity" msgid="3742083261781538852">"Ukukhiqiza"</string>
<string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Isitoreji sedivayisi"</string>
- <!-- no translation found for adb_debugging_notification_channel_tv (5537766997350092316) -->
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"Ukulungisa iphutha le-USB"</string>
+ <!-- no translation found for time_picker_hour_label (2979075098868106450) -->
+ <skip />
+ <!-- no translation found for time_picker_minute_label (5168864173796598399) -->
+ <skip />
+ <!-- no translation found for time_picker_header_text (143536825321922567) -->
+ <skip />
+ <!-- no translation found for time_picker_input_error (7574999942502513765) -->
+ <skip />
+ <!-- no translation found for time_picker_prompt_label (7588093983899966783) -->
+ <skip />
+ <!-- no translation found for time_picker_text_input_mode_description (4148166758173708199) -->
+ <skip />
+ <!-- no translation found for time_picker_radial_mode_description (4953403779779557198) -->
<skip />
</resources>
diff --git a/data/etc/platform.xml b/data/etc/platform.xml
index b394c3c..344f3c8 100644
--- a/data/etc/platform.xml
+++ b/data/etc/platform.xml
@@ -179,6 +179,7 @@
<!-- This is a core platform component that needs to freely run in the background -->
<allow-in-power-save package="com.android.cellbroadcastreceiver" />
+ <allow-in-power-save package="com.android.shell" />
<!-- These are the packages that are white-listed to be able to run as system user -->
<system-user-whitelisted-app package="com.android.settings" />
diff --git a/graphics/java/android/graphics/BitmapFactory.java b/graphics/java/android/graphics/BitmapFactory.java
index 64a726b..a3c6c6e 100644
--- a/graphics/java/android/graphics/BitmapFactory.java
+++ b/graphics/java/android/graphics/BitmapFactory.java
@@ -350,11 +350,17 @@
/**
* If known, this string is set to the mimetype of the decoded image.
- * If not know, or there is an error, it is set to null.
+ * If not known, or there is an error, it is set to null.
*/
public String outMimeType;
/**
+ * If known, the config the decoded bitmap will have.
+ * If not known, or there is an error, it is set to null.
+ */
+ public Bitmap.Config outConfig;
+
+ /**
* Temp storage to use for decoding. Suggest 16K or so.
*/
public byte[] inTempStorage;
diff --git a/libs/hwui/DisplayList.cpp b/libs/hwui/DisplayList.cpp
index 3853356..0ff101c 100644
--- a/libs/hwui/DisplayList.cpp
+++ b/libs/hwui/DisplayList.cpp
@@ -22,6 +22,7 @@
#include "DamageAccumulator.h"
#include "Debug.h"
#include "DisplayList.h"
+#include "OpDumper.h"
#include "RecordedOp.h"
#include "RenderNode.h"
#include "VectorDrawable.h"
@@ -127,5 +128,17 @@
return isDirty;
}
+void DisplayList::output(std::ostream& output, uint32_t level) {
+ for (auto&& op : getOps()) {
+ OpDumper::dump(*op, output, level + 1);
+ if (op->opId == RecordedOpId::RenderNodeOp) {
+ auto rnOp = reinterpret_cast<const RenderNodeOp*>(op);
+ rnOp->renderNode->output(output, level + 1);
+ } else {
+ output << std::endl;
+ }
+ }
+}
+
}; // namespace uirenderer
}; // namespace android
diff --git a/libs/hwui/DisplayList.h b/libs/hwui/DisplayList.h
index ef0fd31..d22a764 100644
--- a/libs/hwui/DisplayList.h
+++ b/libs/hwui/DisplayList.h
@@ -128,6 +128,8 @@
virtual bool prepareListAndChildren(TreeObserver& observer, TreeInfo& info, bool functorsNeedLayer,
std::function<void(RenderNode*, TreeObserver&, TreeInfo&, bool)> childFn);
+ virtual void output(std::ostream& output, uint32_t level);
+
protected:
// allocator into which all ops and LsaVector arrays allocated
LinearAllocator allocator;
diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp
index f1c8232..55eeb7f 100644
--- a/libs/hwui/RenderNode.cpp
+++ b/libs/hwui/RenderNode.cpp
@@ -19,7 +19,6 @@
#include "BakedOpRenderer.h"
#include "DamageAccumulator.h"
#include "Debug.h"
-#include "OpDumper.h"
#include "RecordedOp.h"
#include "TreeInfo.h"
#include "utils/FatVector.h"
@@ -99,15 +98,7 @@
properties().debugOutputProperties(output, level + 1);
if (mDisplayList) {
- for (auto&& op : mDisplayList->getOps()) {
- OpDumper::dump(*op, output, level + 1);
- if (op->opId == RecordedOpId::RenderNodeOp) {
- auto rnOp = reinterpret_cast<const RenderNodeOp*>(op);
- rnOp->renderNode->output(output, level + 1);
- } else {
- output << std::endl;
- }
- }
+ mDisplayList->output(output, level);
}
output << std::string(level * 2, ' ') << "/RenderNode(" << getName() << " " << this << ")";
output << std::endl;
diff --git a/libs/hwui/RenderNode.h b/libs/hwui/RenderNode.h
index a971e83..c4ae82a 100644
--- a/libs/hwui/RenderNode.h
+++ b/libs/hwui/RenderNode.h
@@ -248,6 +248,8 @@
// Called by CanvasContext when it drops a RenderNode from being a root node
void clearRoot();
+ void output(std::ostream& output, uint32_t level);
+
private:
void computeOrderingImpl(RenderNodeOp* opState,
std::vector<RenderNodeOp*>* compositedChildrenOfProjectionSurface,
@@ -266,7 +268,6 @@
void incParentRefCount() { mParentCount++; }
void decParentRefCount(TreeObserver& observer, TreeInfo* info = nullptr);
- void output(std::ostream& output, uint32_t level);
String8 mName;
sp<VirtualLightRefBase> mUserContext;
diff --git a/libs/hwui/SkiaCanvasProxy.cpp b/libs/hwui/SkiaCanvasProxy.cpp
index f32612d..20ca80b 100644
--- a/libs/hwui/SkiaCanvasProxy.cpp
+++ b/libs/hwui/SkiaCanvasProxy.cpp
@@ -103,6 +103,12 @@
}
}
+void SkiaCanvasProxy::onDrawArc(const SkRect& rect, SkScalar startAngle, SkScalar sweepAngle,
+ bool useCenter, const SkPaint& paint) {
+ mCanvas->drawArc(rect.fLeft, rect.fTop, rect.fRight, rect.fBottom,
+ startAngle, sweepAngle, useCenter, paint);
+}
+
void SkiaCanvasProxy::onDrawPath(const SkPath& path, const SkPaint& paint) {
mCanvas->drawPath(path, paint);
}
diff --git a/libs/hwui/SkiaCanvasProxy.h b/libs/hwui/SkiaCanvasProxy.h
index b3f6c07..3b1dd73 100644
--- a/libs/hwui/SkiaCanvasProxy.h
+++ b/libs/hwui/SkiaCanvasProxy.h
@@ -60,6 +60,8 @@
virtual void onDrawRect(const SkRect&, const SkPaint&) override;
virtual void onDrawRRect(const SkRRect&, const SkPaint&) override;
virtual void onDrawPath(const SkPath& path, const SkPaint&) override;
+ virtual void onDrawArc(const SkRect&, SkScalar startAngle, SkScalar sweepAngle, bool useCenter,
+ const SkPaint&) override;
virtual void onDrawBitmap(const SkBitmap&, SkScalar left, SkScalar top,
const SkPaint*) override;
virtual void onDrawBitmapRect(const SkBitmap&, const SkRect* src, const SkRect& dst,
diff --git a/libs/hwui/Texture.cpp b/libs/hwui/Texture.cpp
index 50af9c8..0dbd767 100644
--- a/libs/hwui/Texture.cpp
+++ b/libs/hwui/Texture.cpp
@@ -282,7 +282,7 @@
setDefaultParams = true;
}
- sk_sp<SkColorSpace> sRGB = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);
+ sk_sp<SkColorSpace> sRGB = SkColorSpace::MakeSRGB();
bool needSRGB = bitmap.info().colorSpace() == sRGB.get();
GLint internalFormat, format, type;
diff --git a/libs/hwui/VectorDrawable.cpp b/libs/hwui/VectorDrawable.cpp
index 208107f..68d3dd5 100644
--- a/libs/hwui/VectorDrawable.cpp
+++ b/libs/hwui/VectorDrawable.cpp
@@ -564,7 +564,7 @@
#ifndef ANDROID_ENABLE_LINEAR_BLENDING
sk_sp<SkColorSpace> colorSpace = nullptr;
#else
- sk_sp<SkColorSpace> colorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);
+ sk_sp<SkColorSpace> colorSpace = SkColorSpace::MakeSRGB();
#endif
SkImageInfo info = SkImageInfo::MakeN32(width, height, kPremul_SkAlphaType, colorSpace);
cache.bitmap = Bitmap::allocateHeapBitmap(info);
diff --git a/libs/hwui/hwui/Bitmap.cpp b/libs/hwui/hwui/Bitmap.cpp
index 3e10b36..f9730c9 100644
--- a/libs/hwui/hwui/Bitmap.cpp
+++ b/libs/hwui/hwui/Bitmap.cpp
@@ -232,7 +232,7 @@
return nullptr;
}
- sk_sp<SkColorSpace> sRGB = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);
+ sk_sp<SkColorSpace> sRGB = SkColorSpace::MakeSRGB();
bool needSRGB = skBitmap.info().colorSpace() == sRGB.get();
bool hasSRGB = caches.extensions().hasSRGB();
GLint format, type, internalFormat;
@@ -324,7 +324,7 @@
}
SkImageInfo info = SkImageInfo::Make(graphicBuffer->getWidth(), graphicBuffer->getHeight(),
kRGBA_8888_SkColorType, kPremul_SkAlphaType,
- SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named));
+ SkColorSpace::MakeSRGB());
return sk_sp<Bitmap>(new Bitmap(graphicBuffer.get(), info));
}
diff --git a/libs/hwui/pipeline/skia/DumpOpsCanvas.h b/libs/hwui/pipeline/skia/DumpOpsCanvas.h
new file mode 100644
index 0000000..34fb04c
--- /dev/null
+++ b/libs/hwui/pipeline/skia/DumpOpsCanvas.h
@@ -0,0 +1,185 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+
+#pragma once
+
+#include "SkiaDisplayList.h"
+
+namespace android {
+namespace uirenderer {
+namespace skiapipeline {
+
+/**
+ * DumpOpsCanvas prints drawing ops from a SkiaDisplayList into a std::ostream. Children render
+ * nodes are walked recursively and their drawing ops are printed as well.
+ */
+class DumpOpsCanvas : public SkCanvas {
+public:
+ DumpOpsCanvas(std::ostream& output, int level, SkiaDisplayList& displayList)
+ : mOutput(output)
+ , mLevel(level)
+ , mDisplayList(displayList)
+ , mIdent((level + 1) * 2, ' ') {
+ }
+
+protected:
+ void onClipRect(const SkRect& rect, SkClipOp, ClipEdgeStyle) override {
+ mOutput << mIdent << "clipRect" << std::endl;
+ }
+
+ void onClipRRect(const SkRRect& rrect, SkClipOp, ClipEdgeStyle) override {
+ mOutput << mIdent << "clipRRect" << std::endl;
+ }
+
+ void onClipPath(const SkPath& path, SkClipOp, ClipEdgeStyle) override {
+ mOutput << mIdent << "clipPath" << std::endl;
+ }
+
+ void onClipRegion(const SkRegion& deviceRgn, SkClipOp) override {
+ mOutput << mIdent << "clipRegion" << std::endl;
+ }
+
+ void onDrawPaint(const SkPaint&) override {
+ mOutput << mIdent << "drawPaint" << std::endl;
+ }
+
+ void onDrawPath(const SkPath&, const SkPaint&) override {
+ mOutput << mIdent << "drawPath" << std::endl;
+ }
+
+ void onDrawRect(const SkRect&, const SkPaint&) override {
+ mOutput << mIdent << "drawRect" << std::endl;
+ }
+
+ void onDrawRegion(const SkRegion&, const SkPaint&) override {
+ mOutput << mIdent << "drawRegion" << std::endl;
+ }
+
+ void onDrawOval(const SkRect&, const SkPaint&) override {
+ mOutput << mIdent << "drawOval" << std::endl;
+ }
+
+ void onDrawArc(const SkRect&, SkScalar, SkScalar, bool, const SkPaint&) override {
+ mOutput << mIdent << "drawArc" << std::endl;
+ }
+
+ void onDrawRRect(const SkRRect&, const SkPaint&) override {
+ mOutput << mIdent << "drawRRect" << std::endl;
+ }
+
+ void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override {
+ mOutput << mIdent << "drawDRRect" << std::endl;
+ }
+
+ void onDrawText(const void*, size_t, SkScalar, SkScalar, const SkPaint&) override {
+ mOutput << mIdent << "drawText" << std::endl;
+ }
+
+ void onDrawPosText(const void*, size_t, const SkPoint[], const SkPaint&) override {
+ mOutput << mIdent << "drawPosText" << std::endl;
+ }
+
+ void onDrawPosTextH(const void*, size_t, const SkScalar[], SkScalar,
+ const SkPaint&) override {
+ mOutput << mIdent << "drawPosTextH" << std::endl;
+ }
+
+ void onDrawTextOnPath(const void*, size_t, const SkPath&, const SkMatrix*,
+ const SkPaint&) override {
+ mOutput << mIdent << "drawTextOnPath" << std::endl;
+ }
+
+ void onDrawTextRSXform(const void*, size_t, const SkRSXform[], const SkRect*,
+ const SkPaint&) override {
+ mOutput << mIdent << "drawTextRSXform" << std::endl;
+ }
+
+ void onDrawTextBlob(const SkTextBlob*, SkScalar,SkScalar, const SkPaint&) override {
+ mOutput << mIdent << "drawTextBlob" << std::endl;
+ }
+
+ void onDrawImage(const SkImage*, SkScalar dx, SkScalar dy, const SkPaint*) override {
+ mOutput << mIdent << "drawImage" << std::endl;
+ }
+
+ void onDrawImageNine(const SkImage*, const SkIRect& center, const SkRect& dst,
+ const SkPaint*) override {
+ mOutput << mIdent << "drawImageNine" << std::endl;
+ }
+
+ void onDrawImageRect(const SkImage*, const SkRect*, const SkRect&, const SkPaint*,
+ SrcRectConstraint) override {
+ mOutput << mIdent << "drawImageRect" << std::endl;
+ }
+
+ void onDrawImageLattice(const SkImage*, const Lattice& lattice, const SkRect& dst,
+ const SkPaint*) override {
+ mOutput << mIdent << "drawImageLattice" << std::endl;
+ }
+
+ void onDrawPoints(SkCanvas::PointMode, size_t, const SkPoint[], const SkPaint&) override {
+ mOutput << mIdent << "drawPoints" << std::endl;
+ }
+
+ void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override {
+ mOutput << mIdent << "drawPicture" << std::endl;
+ }
+
+ void onDrawDrawable(SkDrawable* drawable, const SkMatrix*) override {
+ mOutput << mIdent;
+ auto renderNodeDrawable = getRenderNodeDrawable(drawable);
+ if (nullptr != renderNodeDrawable) {
+ mOutput << std::string(mLevel * 2, ' ') << "drawRenderNode";
+ renderNodeDrawable->getRenderNode()->output(mOutput, mLevel + 1);
+ return;
+ }
+ auto glFunctorDrawable = getGLFunctorDrawable(drawable);
+ if (nullptr != glFunctorDrawable) {
+ mOutput << std::string(mLevel * 2, ' ') << "drawGLFunctorDrawable" << std::endl;
+ return;
+ }
+
+ mOutput << std::string(mLevel * 2, ' ') << "drawDrawable" << std::endl;
+ }
+
+private:
+ RenderNodeDrawable* getRenderNodeDrawable(SkDrawable* drawable) {
+ for (auto& child : mDisplayList.mChildNodes) {
+ if (drawable == &child) {
+ return &child;
+ }
+ }
+ return nullptr;
+ }
+
+ GLFunctorDrawable* getGLFunctorDrawable(SkDrawable* drawable) {
+ for (auto& child : mDisplayList.mChildFunctors) {
+ if (drawable == &child) {
+ return &child;
+ }
+ }
+ return nullptr;
+ }
+
+ std::ostream& mOutput;
+ int mLevel;
+ SkiaDisplayList& mDisplayList;
+ std::string mIdent;
+};
+
+}; // namespace skiapipeline
+}; // namespace uirenderer
+}; // namespace android
diff --git a/libs/hwui/pipeline/skia/SkiaDisplayList.cpp b/libs/hwui/pipeline/skia/SkiaDisplayList.cpp
index 36d02ecb..b4babcb 100644
--- a/libs/hwui/pipeline/skia/SkiaDisplayList.cpp
+++ b/libs/hwui/pipeline/skia/SkiaDisplayList.cpp
@@ -18,6 +18,7 @@
#include "renderthread/CanvasContext.h"
#include "VectorDrawable.h"
+#include "DumpOpsCanvas.h"
#include <SkImagePriv.h>
@@ -116,6 +117,11 @@
new (&allocator) LinearAllocator();
}
+void SkiaDisplayList::output(std::ostream& output, uint32_t level) {
+ DumpOpsCanvas canvas(output, level, *this);
+ mDrawable->draw(&canvas, nullptr);
+}
+
}; // namespace skiapipeline
}; // namespace uirenderer
}; // namespace android
diff --git a/libs/hwui/pipeline/skia/SkiaDisplayList.h b/libs/hwui/pipeline/skia/SkiaDisplayList.h
index 2a01330..439b999 100644
--- a/libs/hwui/pipeline/skia/SkiaDisplayList.h
+++ b/libs/hwui/pipeline/skia/SkiaDisplayList.h
@@ -126,6 +126,8 @@
*/
inline bool containsProjectionReceiver() const { return mProjectionReceiver; }
+ void output(std::ostream& output, uint32_t level) override;
+
/**
* We use std::deque here because (1) we need to iterate through these
* elements and (2) mDrawable holds pointers to the elements, so they cannot
diff --git a/libs/hwui/tests/unit/SkiaBehaviorTests.cpp b/libs/hwui/tests/unit/SkiaBehaviorTests.cpp
index f32d97a..03e6b7f 100644
--- a/libs/hwui/tests/unit/SkiaBehaviorTests.cpp
+++ b/libs/hwui/tests/unit/SkiaBehaviorTests.cpp
@@ -93,7 +93,7 @@
}
TEST(SkiaBehavior, srgbColorSpaceIsSingleton) {
- sk_sp<SkColorSpace> sRGB1 = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);
- sk_sp<SkColorSpace> sRGB2 = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);
+ sk_sp<SkColorSpace> sRGB1 = SkColorSpace::MakeSRGB();
+ sk_sp<SkColorSpace> sRGB2 = SkColorSpace::MakeSRGB();
ASSERT_EQ(sRGB1.get(), sRGB2.get());
}
diff --git a/libs/hwui/utils/TestWindowContext.cpp b/libs/hwui/utils/TestWindowContext.cpp
index 79fc864..ecad7be 100644
--- a/libs/hwui/utils/TestWindowContext.cpp
+++ b/libs/hwui/utils/TestWindowContext.cpp
@@ -109,7 +109,7 @@
}
bool capturePixels(SkBitmap* bmp) {
- sk_sp<SkColorSpace> colorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);
+ sk_sp<SkColorSpace> colorSpace = SkColorSpace::MakeSRGB();
SkImageInfo destinationConfig =
SkImageInfo::Make(mSize.width(), mSize.height(),
kRGBA_8888_SkColorType, kPremul_SkAlphaType, colorSpace);
diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java
index 3e88450..7a6499d 100644
--- a/media/java/android/media/MediaRecorder.java
+++ b/media/java/android/media/MediaRecorder.java
@@ -910,7 +910,7 @@
* not start another recording session during recording.
*
* @throws IllegalStateException if it is called before
- * prepare().
+ * prepare() or when the camera is already in use by another app.
*/
public native void start() throws IllegalStateException;
diff --git a/native/android/Android.mk b/native/android/Android.mk
index f510b48..f8405ef 100644
--- a/native/android/Android.mk
+++ b/native/android/Android.mk
@@ -12,10 +12,12 @@
choreographer.cpp \
configuration.cpp \
hardware_buffer.cpp \
+ hardware_buffer_jni.cpp \
input.cpp \
looper.cpp \
native_activity.cpp \
native_window.cpp \
+ native_window_jni.cpp \
net.c \
obb.cpp \
sensor.cpp \
diff --git a/native/android/hardware_buffer.cpp b/native/android/hardware_buffer.cpp
index e5e928d..77ebd52 100644
--- a/native/android/hardware_buffer.cpp
+++ b/native/android/hardware_buffer.cpp
@@ -16,24 +16,25 @@
#define LOG_TAG "AHardwareBuffer"
-#include <android/hardware_buffer_jni.h>
+#include <android/hardware_buffer.h>
#include <errno.h>
#include <sys/socket.h>
#include <memory>
-#include <android_runtime/android_hardware_HardwareBuffer.h>
-#include <binder/Binder.h>
-#include <binder/Parcel.h>
-#include <binder/IServiceManager.h>
#include <cutils/native_handle.h>
+
+#include <utils/Log.h>
+
+#include <ui/GraphicBuffer.h>
+
+#include <binder/IServiceManager.h>
#include <gui/ISurfaceComposer.h>
#include <gui/IGraphicBufferAlloc.h>
-#include <hardware/gralloc1.h>
-#include <ui/GraphicBuffer.h>
-#include <utils/Flattenable.h>
-#include <utils/Log.h>
+
+#include <android_runtime/android_hardware_HardwareBuffer.h>
+
static constexpr int kDataBufferSize = 64 * sizeof(int); // 64 ints
@@ -299,19 +300,3 @@
const GraphicBuffer* gbuffer = AHardwareBuffer_to_GraphicBuffer(buffer);
return gbuffer->handle;
}
-
-// ----------------------------------------------------------------------------
-// JNI functions
-// ----------------------------------------------------------------------------
-
-AHardwareBuffer* AHardwareBuffer_fromHardwareBuffer(JNIEnv* env,
- jobject hardwareBufferObj) {
- return android_hardware_HardwareBuffer_getNativeHardwareBuffer(env,
- hardwareBufferObj);
-}
-
-jobject AHardwareBuffer_toHardwareBuffer(JNIEnv* env,
- AHardwareBuffer* hardwareBuffer) {
- return android_hardware_HardwareBuffer_createFromAHardwareBuffer(env,
- hardwareBuffer);
-}
diff --git a/native/android/hardware_buffer_jni.cpp b/native/android/hardware_buffer_jni.cpp
new file mode 100644
index 0000000..06b0782
--- /dev/null
+++ b/native/android/hardware_buffer_jni.cpp
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+
+#define LOG_TAG "AHardwareBuffer"
+
+#include <android/hardware_buffer_jni.h>
+
+#include <android_runtime/android_hardware_HardwareBuffer.h>
+
+using namespace android;
+
+AHardwareBuffer* AHardwareBuffer_fromHardwareBuffer(JNIEnv* env, jobject hardwareBufferObj) {
+ return android_hardware_HardwareBuffer_getNativeHardwareBuffer(env, hardwareBufferObj);
+}
+
+jobject AHardwareBuffer_toHardwareBuffer(JNIEnv* env, AHardwareBuffer* hardwareBuffer) {
+ return android_hardware_HardwareBuffer_createFromAHardwareBuffer(env, hardwareBuffer);
+}
diff --git a/native/android/native_window.cpp b/native/android/native_window.cpp
index ca0c9028..8c080d7 100644
--- a/native/android/native_window.cpp
+++ b/native/android/native_window.cpp
@@ -15,22 +15,9 @@
*/
#define LOG_TAG "Surface"
-#include <utils/Log.h>
-#include <android/native_window_jni.h>
-#include <gui/Surface.h>
-#include <android_runtime/android_view_Surface.h>
-#include <android_runtime/android_graphics_SurfaceTexture.h>
-
-using namespace android;
-
-ANativeWindow* ANativeWindow_fromSurface(JNIEnv* env, jobject surface) {
- sp<ANativeWindow> win = android_view_Surface_getNativeWindow(env, surface);
- if (win != NULL) {
- win->incStrong((void*)ANativeWindow_acquire);
- }
- return win.get();
-}
+#include <android/native_window.h>
+#include <system/window.h>
void ANativeWindow_acquire(ANativeWindow* window) {
window->incStrong((void*)ANativeWindow_acquire);
diff --git a/native/android/native_window_jni.cpp b/native/android/native_window_jni.cpp
new file mode 100644
index 0000000..dc30405
--- /dev/null
+++ b/native/android/native_window_jni.cpp
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+
+#define LOG_TAG "Surface"
+
+#include <android/native_window_jni.h>
+#include <android/native_window.h>
+#include <system/window.h>
+
+#include <utils/StrongPointer.h>
+
+#include <android_runtime/android_view_Surface.h>
+
+using namespace android;
+
+ANativeWindow* ANativeWindow_fromSurface(JNIEnv* env, jobject surface) {
+ sp<ANativeWindow> win = android_view_Surface_getNativeWindow(env, surface);
+ if (win != NULL) {
+ win->incStrong((void*)ANativeWindow_fromSurface);
+ }
+ return win.get();
+}
diff --git a/packages/Keyguard/Android.mk b/packages/Keyguard/Android.mk
deleted file mode 100644
index 38cf559..0000000
--- a/packages/Keyguard/Android.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright (C) 2013 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.
-#
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := SystemUI-tags
-
-LOCAL_SRC_FILES := src/com/android/systemui/EventLogTags.logtags
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-# ------------------
-
-include $(CLEAR_VARS)
-
-LOCAL_USE_AAPT2 := true
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-subdir-Iaidl-files)
-
-LOCAL_MODULE := Keyguard
-
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JAVA_LIBRARIES := SettingsLib
-
-LOCAL_STATIC_JAVA_LIBRARIES = SystemUI-tags
-
-LOCAL_PRIVILEGED_MODULE := true
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_JAR_EXCLUDE_FILES := none
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-#include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/packages/Keyguard/test/Android.mk b/packages/Keyguard/test/Android.mk
deleted file mode 100644
index 54224b7..0000000
--- a/packages/Keyguard/test/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (C) 2013 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.
-#
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_USE_AAPT2 := true
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := KeyguardTest
-
-# Remove these to verify permission checks are working correctly
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := true
-
-# LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-include $(BUILD_PACKAGE)
diff --git a/packages/Keyguard/test/AndroidManifest.xml b/packages/Keyguard/test/AndroidManifest.xml
deleted file mode 100644
index 1638127..0000000
--- a/packages/Keyguard/test/AndroidManifest.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2013, 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.
-*/
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.keyguard.test">
- <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="17"/>
- <uses-permission android:name="android.permission.CONTROL_KEYGUARD" />
- <application android:label="@string/app_name" android:icon="@drawable/app_icon">
- <activity android:name=".KeyguardTestActivity"
- android:label="@string/app_name"
- android:theme="@android:style/Theme.DeviceDefault.Light">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
- </application>
-</manifest>
diff --git a/packages/Keyguard/test/SampleTrustAgent/Android.mk b/packages/Keyguard/test/SampleTrustAgent/Android.mk
deleted file mode 100644
index 6ffb018..0000000
--- a/packages/Keyguard/test/SampleTrustAgent/Android.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (C) 2014 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.
-#
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_USE_AAPT2 := true
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := SampleTrustAgent
-
-# Remove this to verify permission checks are working correctly
-LOCAL_CERTIFICATE := platform
-
-LOCAL_MODULE_TAGS := tests
-
-# LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-LOCAL_STATIC_ANDROID_LIBRARIES := android-support-v4
-
-include $(BUILD_PACKAGE)
diff --git a/packages/Keyguard/test/SampleTrustAgent/AndroidManifest.xml b/packages/Keyguard/test/SampleTrustAgent/AndroidManifest.xml
deleted file mode 100644
index edcea0e..0000000
--- a/packages/Keyguard/test/SampleTrustAgent/AndroidManifest.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2014 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
- -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.trustagent.test">
- <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="17"/>
- <uses-permission android:name="android.permission.CONTROL_KEYGUARD" />
- <uses-permission android:name="android.permission.PROVIDE_TRUST_AGENT" />
- <application android:label="@string/app_name">
- <service
- android:name=".SampleTrustAgent"
- android:label="@string/app_name"
- android:permission="android.permission.BIND_TRUST_AGENT"
- android:directBootAware="true"
- android:exported="true">
- <intent-filter>
- <action android:name="android.service.trust.TrustAgentService" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- <meta-data android:name="android.service.trust.trustagent"
- android:resource="@xml/sample_trust_agent"/>
- </service>
-
- <activity
- android:name=".SampleTrustAgentSettings"
- android:label="@string/app_name"
- android:exported="true"
- android:launchMode="singleInstance" >
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
- </application>
-</manifest>
diff --git a/packages/Keyguard/test/SampleTrustAgent/res/layout-v26/sample_trust_agent_settings.xml b/packages/Keyguard/test/SampleTrustAgent/res/layout-v26/sample_trust_agent_settings.xml
deleted file mode 100644
index 4669971..0000000
--- a/packages/Keyguard/test/SampleTrustAgent/res/layout-v26/sample_trust_agent_settings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- ~ Copyright (C) 2014 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
- -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
- <Button android:id="@+id/enable_trust"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="Grant trust for 30 seconds" />
- <Button android:id="@+id/revoke_trust"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="Revoke trust" />
- <Button android:id="@+id/crash"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="Crash" />
- <CheckBox android:id="@+id/managing_trust"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="8dp"
- android:paddingBottom="8dp"
- android:text="Managing trust" />
- <CheckBox android:id="@+id/managing_trust_direct_boot"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="8dp"
- android:paddingBottom="8dp"
- android:text="Managing trust direct boot"/>
-
- <CheckBox android:id="@+id/report_unlock_attempts"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="8dp"
- android:paddingBottom="8dp"
- android:text="Report unlock attempts" />
- <CheckBox android:id="@+id/report_device_locked"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="8dp"
- android:paddingBottom="8dp"
- android:text="Report device locked or unlocked" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
- <Button android:id="@+id/check_device_locked"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="Device locked?" />
- <TextView android:id="@+id/check_device_locked_result"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1" />
- </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/packages/Keyguard/test/SampleTrustAgent/res/layout/sample_trust_agent_settings.xml b/packages/Keyguard/test/SampleTrustAgent/res/layout/sample_trust_agent_settings.xml
deleted file mode 100644
index 00193ed..0000000
--- a/packages/Keyguard/test/SampleTrustAgent/res/layout/sample_trust_agent_settings.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- ~ Copyright (C) 2014 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
- -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
- <Button android:id="@+id/enable_trust"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="Grant trust for 30 seconds" />
- <Button android:id="@+id/revoke_trust"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="Revoke trust" />
- <Button android:id="@+id/crash"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="Crash" />
- <CheckBox android:id="@+id/managing_trust"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="8dp"
- android:paddingBottom="8dp"
- android:text="Managing trust" />
- <CheckBox android:id="@+id/report_unlock_attempts"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="8dp"
- android:paddingBottom="8dp"
- android:text="Report unlock attempts" />
- <CheckBox android:id="@+id/report_device_locked"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="8dp"
- android:paddingBottom="8dp"
- android:text="Report device locked or unlocked" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
- <Button android:id="@+id/check_device_locked"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="Device locked?" />
- <TextView android:id="@+id/check_device_locked_result"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1" />
- </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/packages/Keyguard/test/SampleTrustAgent/res/values/strings.xml b/packages/Keyguard/test/SampleTrustAgent/res/values/strings.xml
deleted file mode 100644
index 0c6b502..0000000
--- a/packages/Keyguard/test/SampleTrustAgent/res/values/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2014 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
- -->
-
-<resources>
- <string name="app_name">Sample Trust Agent</string>
-</resources>
\ No newline at end of file
diff --git a/packages/Keyguard/test/SampleTrustAgent/res/xml-v26/sample_trust_agent.xml b/packages/Keyguard/test/SampleTrustAgent/res/xml-v26/sample_trust_agent.xml
deleted file mode 100644
index 26d5aa0..0000000
--- a/packages/Keyguard/test/SampleTrustAgent/res/xml-v26/sample_trust_agent.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2014 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
- -->
-<trust-agent xmlns:android="http://schemas.android.com/apk/res/android"
- android:settingsActivity=".SampleTrustAgentSettings"
- android:unlockProfile="true" />
diff --git a/packages/Keyguard/test/SampleTrustAgent/res/xml/sample_trust_agent.xml b/packages/Keyguard/test/SampleTrustAgent/res/xml/sample_trust_agent.xml
deleted file mode 100644
index 6cd34bb..0000000
--- a/packages/Keyguard/test/SampleTrustAgent/res/xml/sample_trust_agent.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2014 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
- -->
-<trust-agent xmlns:android="http://schemas.android.com/apk/res/android"
- android:settingsActivity=".SampleTrustAgentSettings" />
diff --git a/packages/Keyguard/test/SampleTrustAgent/src/com/android/trustagent/test/SampleTrustAgent.java b/packages/Keyguard/test/SampleTrustAgent/src/com/android/trustagent/test/SampleTrustAgent.java
deleted file mode 100644
index 4b50cf8..0000000
--- a/packages/Keyguard/test/SampleTrustAgent/src/com/android/trustagent/test/SampleTrustAgent.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * Copyright (C) 2014 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.trustagent.test;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.SharedPreferences;
-import android.os.PersistableBundle;
-import android.os.UserManager;
-import android.preference.PreferenceManager;
-import android.service.trust.TrustAgentService;
-import android.support.v4.content.LocalBroadcastManager;
-import android.util.Log;
-import android.widget.Toast;
-
-import java.util.List;
-
-public class SampleTrustAgent extends TrustAgentService
- implements SharedPreferences.OnSharedPreferenceChangeListener {
-
- /**
- * If true, allows anyone to control this trust agent, e.g. using adb:
- * <pre>
- * $ adb shell am broadcast -a action.sample_trust_agent.grant_trust\
- * -e extra.message SampleTrust\
- * --el extra.duration 1000 --ez extra.init_by_user false --ez extra.dismiss_keyguard false
- * </pre>
- */
- private static final boolean ALLOW_EXTERNAL_BROADCASTS = false;
-
- LocalBroadcastManager mLocalBroadcastManager;
-
- private static final String ACTION_GRANT_TRUST = "action.sample_trust_agent.grant_trust";
- private static final String ACTION_REVOKE_TRUST = "action.sample_trust_agent.revoke_trust";
-
- private static final String EXTRA_MESSAGE = "extra.message";
- private static final String EXTRA_DURATION = "extra.duration";
- private static final String EXTRA_INITIATED_BY_USER = "extra.init_by_user";
- private static final String EXTRA_DISMISS_KEYGUARD = "extra.dismiss_keyguard";
-
- private static final String PREFERENCE_REPORT_UNLOCK_ATTEMPTS
- = "preference.report_unlock_attempts";
- private static final String PREFERENCE_MANAGING_TRUST
- = "preference.managing_trust";
- private static final String PREFERENCE_MANAGING_TRUST_DIRECT_BOOT
- = "preference.managing_trust_direct_boot";
- private static final String PREFERENCE_REPORT_DEVICE_LOCKED = "preference.report_device_locked";
-
- private static final String TAG = "SampleTrustAgent";
-
- private static final BroadcastReceiver mUnlockReceiver = new BroadcastReceiver() {
- @Override
- public void onReceive(Context context, Intent intent) {
-
- }
- };
-
- private boolean mIsUserUnlocked;
-
- @Override
- public void onCreate() {
- super.onCreate();
- UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
- mIsUserUnlocked = um.isUserUnlocked();
- Log.i(TAG,, "onCreate, is user unlocked=" + mIsUserUnlocked);
- mLocalBroadcastManager = LocalBroadcastManager.getInstance(this);
-
- IntentFilter filter = new IntentFilter();
- filter.addAction(ACTION_GRANT_TRUST);
- filter.addAction(ACTION_REVOKE_TRUST);
- if (!mIsUserUnlocked) {
- filter.addAction(Intent.ACTION_BOOT_COMPLETED);
- }
- mLocalBroadcastManager.registerReceiver(mReceiver, filter);
- if (ALLOW_EXTERNAL_BROADCASTS) {
- registerReceiver(mReceiver, filter);
- }
-
- if (!mIsUserUnlocked) {
- boolean trustManaged = getIsManagingTrustDirectBoot(this);
- Log.i(TAG, "in Direct boot." + (trustManaged ? "manage" : "cannot manage") + "trust");
- setManagingTrust(getIsManagingTrustDirectBoot(this));
- } else {
- onBootCompleted();
- }
- }
-
- @Override
- public void onTrustTimeout() {
- super.onTrustTimeout();
- logAndShowToast("onTrustTimeout(): timeout expired");
- }
-
- @Override
- public void onDeviceLocked() {
- super.onDeviceLocked();
- if (getReportDeviceLocked(this)) {
- logAndShowToast("onDeviceLocked(): device is now locked");
- }
- }
-
- @Override
- public void onDeviceUnlocked() {
- super.onDeviceUnlocked();
- if (getReportDeviceLocked(this)) {
- logAndShowToast("onDeviceUnlocked(): device is now unlocked");
- }
- }
-
- @Override
- public void onUnlockAttempt(boolean successful) {
- if (getReportUnlockAttempts(this)) {
- logAndShowToast("onUnlockAttempt(successful=" + successful + ")");
- }
- }
-
- private void logAndShowToast(String text) {
- Log.i(TAG, text);
- Toast.makeText(this, text, Toast.LENGTH_SHORT).show();
- }
-
- @Override
- public boolean onConfigure(List<PersistableBundle> options) {
- if (options != null) {
- for (int i = 0; i < options.size(); i++) {
- Log.v(TAG, "Policy options received: " + options.get(i));
- }
- } else {
- Log.w(TAG, "onConfigure() called with no options");
- }
- // TODO: Handle options
- return true; // inform DPM that we support it
- }
-
- @Override
- public void onDestroy() {
- super.onDestroy();
- mLocalBroadcastManager.unregisterReceiver(mReceiver);
- if (ALLOW_EXTERNAL_BROADCASTS) {
- unregisterReceiver(mReceiver);
- }
- PreferenceManager.getDefaultSharedPreferences(this)
- .unregisterOnSharedPreferenceChangeListener(this);
- }
-
- private void onBootCompleted() {
- PreferenceManager.getDefaultSharedPreferences(this)
- .registerOnSharedPreferenceChangeListener(this);
- setManagingTrust(getIsManagingTrust(this));
- }
-
- private BroadcastReceiver mReceiver = new BroadcastReceiver() {
- @Override
- public void onReceive(Context context, Intent intent) {
- String action = intent.getAction();
- if (ACTION_GRANT_TRUST.equals(action)) {
- int flags = 0;
- if (intent.getBooleanExtra(EXTRA_INITIATED_BY_USER, false)) {
- flags |= TrustAgentService.FLAG_GRANT_TRUST_INITIATED_BY_USER;
- }
- if (intent.getBooleanExtra(EXTRA_DISMISS_KEYGUARD, false)) {
- flags |= TrustAgentService.FLAG_GRANT_TRUST_DISMISS_KEYGUARD;
- }
-
- try {
- grantTrust(intent.getStringExtra(EXTRA_MESSAGE),
- intent.getLongExtra(EXTRA_DURATION, 0), flags);
- } catch (IllegalStateException e) {
- logAndShowToast("IllegalStateException: " + e.getMessage());
- }
- } else if (ACTION_REVOKE_TRUST.equals(action)) {
- revokeTrust();
- } else if (intent.ACTION_BOOT_COMPLETED.equals(action)) {
- Log.d(TAG, "User unlocked and boot completed.");
- onBootCompleted();
- }
- }
- };
-
- public static void sendGrantTrust(Context context,
- String message, long durationMs, boolean initiatedByUser) {
- Intent intent = new Intent(ACTION_GRANT_TRUST);
- intent.putExtra(EXTRA_MESSAGE, message);
- intent.putExtra(EXTRA_DURATION, durationMs);
- intent.putExtra(EXTRA_INITIATED_BY_USER, initiatedByUser);
- LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
- }
-
- public static void sendRevokeTrust(Context context) {
- Intent intent = new Intent(ACTION_REVOKE_TRUST);
- LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
- }
-
- public static void setReportUnlockAttempts(Context context, boolean enabled) {
- SharedPreferences sharedPreferences = PreferenceManager
- .getDefaultSharedPreferences(context);
- sharedPreferences.edit().putBoolean(PREFERENCE_REPORT_UNLOCK_ATTEMPTS, enabled).apply();
- }
-
- public static boolean getReportUnlockAttempts(Context context) {
- SharedPreferences sharedPreferences = PreferenceManager
- .getDefaultSharedPreferences(context);
- return sharedPreferences.getBoolean(PREFERENCE_REPORT_UNLOCK_ATTEMPTS, false);
- }
-
- public static void setReportDeviceLocked(Context context, boolean enabled) {
- SharedPreferences sharedPreferences = PreferenceManager
- .getDefaultSharedPreferences(context);
- sharedPreferences.edit().putBoolean(PREFERENCE_REPORT_DEVICE_LOCKED, enabled).apply();
- }
-
- public static boolean getReportDeviceLocked(Context context) {
- SharedPreferences sharedPreferences = PreferenceManager
- .getDefaultSharedPreferences(context);
- return sharedPreferences.getBoolean(PREFERENCE_REPORT_DEVICE_LOCKED, false);
- }
-
- public static void setIsManagingTrust(Context context, boolean enabled) {
- SharedPreferences sharedPreferences = PreferenceManager
- .getDefaultSharedPreferences(context);
- Log.d("AAAA", "save manage trust preference. Enabled=" + enabled);
- sharedPreferences.edit().putBoolean(PREFERENCE_MANAGING_TRUST, enabled).apply();
- }
-
- public static boolean getIsManagingTrust(Context context) {
- SharedPreferences sharedPreferences = PreferenceManager
- .getDefaultSharedPreferences(context);
- return sharedPreferences.getBoolean(PREFERENCE_MANAGING_TRUST, false);
- }
-
- public static void setIsManagingTrustDirectBoot(Context context, boolean enabled) {
- Context directBootContext = context.createDeviceProtectedStorageContext();
- SharedPreferences sharedPreferences = PreferenceManager
- .getDefaultSharedPreferences(directBootContext);
- Log.d("AAAA", "save to direct boot preference. Enabled=" + enabled);
- sharedPreferences.edit().putBoolean(PREFERENCE_MANAGING_TRUST_DIRECT_BOOT, enabled).apply();
- }
-
- public static boolean getIsManagingTrustDirectBoot(Context context) {
- Context directBootContext = context.createDeviceProtectedStorageContext();
- SharedPreferences sharedPreferences = PreferenceManager
- .getDefaultSharedPreferences(directBootContext);
- return sharedPreferences.getBoolean(PREFERENCE_MANAGING_TRUST_DIRECT_BOOT, false);
- }
-
- @Override
- public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
- if (PREFERENCE_MANAGING_TRUST.equals(key)) {
- setManagingTrust(getIsManagingTrust(this));
- }
- }
-}
diff --git a/packages/Keyguard/test/SampleTrustAgent/src/com/android/trustagent/test/SampleTrustAgentSettings.java b/packages/Keyguard/test/SampleTrustAgent/src/com/android/trustagent/test/SampleTrustAgentSettings.java
deleted file mode 100644
index 1b17169..0000000
--- a/packages/Keyguard/test/SampleTrustAgent/src/com/android/trustagent/test/SampleTrustAgentSettings.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (C) 2014 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.trustagent.test;
-
-import android.annotation.Nullable;
-import android.app.Activity;
-import android.app.KeyguardManager;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.TextView;
-
-public class SampleTrustAgentSettings extends Activity implements View.OnClickListener,
- CompoundButton.OnCheckedChangeListener {
-
- private static final int TRUST_DURATION_MS = 30 * 1000;
-
- private CheckBox mReportUnlockAttempts;
- private CheckBox mReportDeviceLocked;
- private CheckBox mManagingTrust;
- private CheckBox mManagingTrustDirectBoot;
- private TextView mCheckDeviceLockedResult;
-
- private KeyguardManager mKeyguardManager;
-
-
- @Override
- protected void onCreate(@Nullable Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- mKeyguardManager = (KeyguardManager) getSystemService(KEYGUARD_SERVICE);
-
- setContentView(R.layout.sample_trust_agent_settings);
-
- findViewById(R.id.enable_trust).setOnClickListener(this);
- findViewById(R.id.revoke_trust).setOnClickListener(this);
- findViewById(R.id.crash).setOnClickListener(this);
- findViewById(R.id.check_device_locked).setOnClickListener(this);
-
- mReportUnlockAttempts = (CheckBox) findViewById(R.id.report_unlock_attempts);
- mReportUnlockAttempts.setOnCheckedChangeListener(this);
-
- mReportDeviceLocked = (CheckBox) findViewById(R.id.report_device_locked);
- mReportDeviceLocked.setOnCheckedChangeListener(this);
-
- mManagingTrust = (CheckBox) findViewById(R.id.managing_trust);
- mManagingTrust.setOnCheckedChangeListener(this);
- mManagingTrustDirectBoot = (CheckBox) findViewById(R.id.managing_trust_direct_boot);
- mManagingTrustDirectBoot.setOnCheckedChangeListener(this);
-
- mCheckDeviceLockedResult = (TextView) findViewById(R.id.check_device_locked_result);
- }
-
- @Override
- protected void onResume() {
- super.onResume();
- mReportUnlockAttempts.setChecked(SampleTrustAgent.getReportUnlockAttempts(this));
- mManagingTrust.setChecked(SampleTrustAgent.getIsManagingTrust(this));
- mManagingTrustDirectBoot.setChecked(
- SampleTrustAgent.getIsManagingTrustDirectBoot(this));
- updateTrustedState();
- }
-
- @Override
- public void onClick(View v) {
- int id = v.getId();
- if (id == R.id.enable_trust) {
- SampleTrustAgent.sendGrantTrust(this, "SampleTrustAgent", TRUST_DURATION_MS,
- false /* initiatedByUser */);
- } else if (id == R.id.revoke_trust) {
- SampleTrustAgent.sendRevokeTrust(this);
- } else if (id == R.id.crash) {
- throw new RuntimeException("crash");
- } else if (id == R.id.check_device_locked) {
- updateTrustedState();
- }
- }
-
- @Override
- public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
- if (buttonView == mReportUnlockAttempts) {
- SampleTrustAgent.setReportUnlockAttempts(this, isChecked);
- } else if (buttonView == mManagingTrust) {
- SampleTrustAgent.setIsManagingTrust(this, isChecked);
- } else if (buttonView == mReportDeviceLocked) {
- SampleTrustAgent.setReportDeviceLocked(this, isChecked);
- } else if (buttonView == mManagingTrustDirectBoot) {
- SampleTrustAgent.setIsManagingTrustDirectBoot(this, isChecked);
- }
- }
-
- private void updateTrustedState() {
- mCheckDeviceLockedResult.setText(Boolean.toString(
- mKeyguardManager.isDeviceLocked()));
- }
-}
diff --git a/packages/Keyguard/test/res/drawable-hdpi/app_icon.png b/packages/Keyguard/test/res/drawable-hdpi/app_icon.png
deleted file mode 100644
index 732133c..0000000
--- a/packages/Keyguard/test/res/drawable-hdpi/app_icon.png
+++ /dev/null
Binary files differ
diff --git a/packages/Keyguard/test/res/drawable-mdpi/app_icon.png b/packages/Keyguard/test/res/drawable-mdpi/app_icon.png
deleted file mode 100644
index 30eb974..0000000
--- a/packages/Keyguard/test/res/drawable-mdpi/app_icon.png
+++ /dev/null
Binary files differ
diff --git a/packages/Keyguard/test/res/drawable-xhdpi/app_icon.png b/packages/Keyguard/test/res/drawable-xhdpi/app_icon.png
deleted file mode 100644
index c44a330..0000000
--- a/packages/Keyguard/test/res/drawable-xhdpi/app_icon.png
+++ /dev/null
Binary files differ
diff --git a/packages/Keyguard/test/res/layout/keyguard_test_activity.xml b/packages/Keyguard/test/res/layout/keyguard_test_activity.xml
deleted file mode 100644
index dab1088..0000000
--- a/packages/Keyguard/test/res/layout/keyguard_test_activity.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2013, 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.
-*/
--->
-
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:gravity="center">
-
- <Button android:id="@+id/do_keyguard"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/do_keyguard" />
-
- <Button android:id="@+id/on_screen_turned_off"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/on_screen_turned_off" />
-
- <Button android:id="@+id/on_screen_turned_on"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/on_screen_turned_on" />
-
- <Button android:id="@+id/verify_unlock"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/verify_unlock" />
-
-</LinearLayout>
diff --git a/packages/Keyguard/test/res/menu/optionmenu.xml b/packages/Keyguard/test/res/menu/optionmenu.xml
deleted file mode 100644
index 22f300d..0000000
--- a/packages/Keyguard/test/res/menu/optionmenu.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:id="@+id/none_menu_item"
- android:title="@string/none_menu_item" />
- <item android:id="@+id/pin_menu_item"
- android:title="@string/pin_menu_item" />
- <item android:id="@+id/password_menu_item"
- android:title="@string/password_menu_item" />
- <item android:id="@+id/pattern_menu_item"
- android:title="@string/pattern_menu_item" />
- <item android:id="@+id/sim_pin_menu_item"
- android:title="@string/sim_pin_menu_item" />
- <item android:id="@+id/sim_puk_menu_item"
- android:title="@string/sim_puk_menu_item" />
- <item android:id="@+id/add_widget_item"
- android:title="@string/add_widget_item" />
-</menu>
diff --git a/packages/Keyguard/test/res/values/strings.xml b/packages/Keyguard/test/res/values/strings.xml
deleted file mode 100644
index 129204b..0000000
--- a/packages/Keyguard/test/res/values/strings.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/strings.xml
-**
-** Copyright 2013, 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.
-*/
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name">KeyguardTestActivity</string>
- <string name="secure_app_name">UnifiedCamera</string>
- <string name="none_menu_item">No security</string>
- <string name="pin_menu_item">PIN</string>
- <string name="password_menu_item">Password</string>
- <string name="pattern_menu_item">Pattern</string>
- <string name="sim_pin_menu_item">SIM PIN</string>
- <string name="sim_puk_menu_item">SIM PUK</string>
- <string name="add_widget_item">Choose widget...</string>
- <string name="on_screen_turned_off">onScreenTurnedOff</string>
- <string name="on_screen_turned_on">onScreenTurnedOn</string>
- <string name="do_keyguard">doKeyguard</string>
- <string name="verify_unlock">verifyUnlock</string>
-</resources>
diff --git a/packages/Keyguard/test/src/com/android/keyguard/test/KeyguardTestActivity.java b/packages/Keyguard/test/src/com/android/keyguard/test/KeyguardTestActivity.java
deleted file mode 100644
index e89c10e..0000000
--- a/packages/Keyguard/test/src/com/android/keyguard/test/KeyguardTestActivity.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
- * Copyright (C) 2012 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.keyguard.test;
-
-import com.android.internal.policy.IKeyguardShowCallback;
-import com.android.internal.policy.IKeyguardExitCallback;
-import com.android.internal.policy.IKeyguardService;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.RemoteException;
-import android.os.SystemClock;
-import android.provider.Settings;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.WindowManagerPolicy;
-
-import com.android.internal.widget.LockPatternUtils;
-import com.android.internal.widget.LockPatternView.Cell;
-
-import java.util.List;
-
-public class KeyguardTestActivity extends Activity implements OnClickListener {
- private static final String KEYGUARD_PACKAGE = "com.android.keyguard";
- private static final String KEYGUARD_CLASS = "com.android.keyguard.KeyguardService";
- private static final String TAG = "LockScreenTestActivity";
- private static final int MODE_NONE = 0;
- private static final int MODE_PIN = 1;
- private static final int MODE_PASSWORD = 2;
- private static final int MODE_PATTERN = 3;
- private static final int MODE_SIM_PIN = 4;
- private static final int MODE_SIM_PUK = 5;
- private static final String SECURITY_MODE = "security_mode";
- Handler mHandler = new Handler();
-
- IKeyguardService mService = null;
-
- KeyguardShowCallback mKeyguardShowCallback = new KeyguardShowCallback();
- KeyguardExitCallback mKeyguardExitCallback = new KeyguardExitCallback();
-
- RemoteServiceConnection mConnection;
- private boolean mSentSystemReady;
-
- class KeyguardShowCallback extends IKeyguardShowCallback.Stub {
-
- @Override
- public void onShown(IBinder windowToken) throws RemoteException {
- Log.v(TAG, "Keyguard is shown, windowToken = " + windowToken);
- }
- }
-
- class KeyguardExitCallback extends IKeyguardExitCallback.Stub {
-
- @Override
- public void onKeyguardExitResult(final boolean success) throws RemoteException {
- mHandler.post(new Runnable() {
- @Override
- public void run() {
- new AlertDialog.Builder(KeyguardTestActivity.this)
- .setMessage("Result: " + success)
- .setPositiveButton("OK", null)
- .show();
- }
- });
- }
- };
-
- private class RemoteServiceConnection implements ServiceConnection {
- public void onServiceConnected(ComponentName className, IBinder service) {
- Log.v(TAG, "onServiceConnected()");
- mService = IKeyguardService.Stub.asInterface(service);
- try {
- mService.asBinder().linkToDeath(new IBinder.DeathRecipient() {
- @Override
- public void binderDied() {
- new AlertDialog.Builder(KeyguardTestActivity.this)
- .setMessage("Oops! Keygued died")
- .setPositiveButton("OK", null)
- .show();
- }
- }, 0);
- } catch (RemoteException e) {
- Log.w(TAG, "Couldn't linkToDeath");
- e.printStackTrace();
- }
-// try {
-// mService.onSystemReady();
-// } catch (RemoteException e) {
-// Log.v(TAG, "Remote service died trying to call onSystemReady");
-// e.printStackTrace();
-// }
- }
-
- public void onServiceDisconnected(ComponentName className) {
- Log.v(TAG, "onServiceDisconnected()");
- mService = null;
- }
- };
-
- private void bindService() {
- if (mConnection == null) {
- mConnection = new RemoteServiceConnection();
- Intent intent = new Intent();
- intent.setClassName(KEYGUARD_PACKAGE, KEYGUARD_CLASS);
- Log.v(TAG, "BINDING SERVICE: " + KEYGUARD_CLASS);
- if (!bindService(intent, mConnection, Context.BIND_AUTO_CREATE)) {
- Log.v(TAG, "FAILED TO BIND TO KEYGUARD!");
- }
- } else {
- Log.v(TAG, "Service already bound");
- }
- }
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.keyguard_test_activity);
- final int[] buttons = {
- R.id.on_screen_turned_off, R.id.on_screen_turned_on,
- R.id.do_keyguard, R.id.verify_unlock
- };
- for (int i = 0; i < buttons.length; i++) {
- findViewById(buttons[i]).setOnClickListener(this);
- }
- Log.v(TAG, "Binding service...");
- bindService();
- }
-
- @Override
- protected void onSaveInstanceState(Bundle outState) {
- super.onSaveInstanceState(outState);
- outState.putInt(SECURITY_MODE, mSecurityMode);
- }
-
- @Override
- protected void onRestoreInstanceState(Bundle savedInstanceState) {
- super.onRestoreInstanceState(savedInstanceState);
- setMode(savedInstanceState.getInt(SECURITY_MODE));
- }
-
-// TODO: Find a secure way to inject mock into keyguard...
-// @Override
-// public boolean onCreateOptionsMenu(Menu menu) {
-// MenuInflater inflater = getMenuInflater();
-// inflater.inflate(R.menu.optionmenu, menu);
-// return true;
-// }
-
- private void setMode(int mode) {
- mTestSimPin = false;
- mTestSimPuk = false;
- mLockPasswordEnabled = false;
- mLockPatternEnabled = false;
- switch(mode) {
- case MODE_NONE:
- mSecurityModeMock = DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
- break;
- case MODE_PIN:
- mSecurityModeMock = DevicePolicyManager.PASSWORD_QUALITY_NUMERIC;
- mLockPasswordEnabled = true;
- break;
- case MODE_PASSWORD:
- mSecurityModeMock = DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC;
- mLockPasswordEnabled = true;
- break;
- case MODE_PATTERN:
- mSecurityModeMock = DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
- mLockPatternEnabled = true;
- break;
- case MODE_SIM_PIN:
- mTestSimPin = true;
- break;
- case MODE_SIM_PUK:
- mTestSimPuk = true;
- break;
- }
- mSecurityMode = mode;
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- // Handle item selection
- switch (item.getItemId()) {
- case R.id.none_menu_item:
- setMode(MODE_NONE);
- break;
- case R.id.pin_menu_item:
- setMode(MODE_PIN);
- break;
- case R.id.password_menu_item:
- setMode(MODE_PASSWORD);
- break;
- case R.id.pattern_menu_item:
- setMode(MODE_PATTERN);
- break;
- case R.id.sim_pin_menu_item:
- setMode(MODE_SIM_PIN);
- break;
- case R.id.sim_puk_menu_item:
- setMode(MODE_SIM_PUK);
- break;
- case R.id.add_widget_item:
- startWidgetPicker();
- break;
- default:
- return super.onOptionsItemSelected(item);
- }
- try {
- mService.doKeyguardTimeout(null);
- } catch (RemoteException e) {
- Log.e(TAG, "Remote service died");
- e.printStackTrace();
- }
- return true;
- }
-
- private void startWidgetPicker() {
- startActivity(new Intent(Settings.ACTION_SECURITY_SETTINGS));
- }
-
- @Override
- public void onClick(View v) {
- try {
- switch (v.getId()) {
- case R.id.on_screen_turned_on:
- mService.onScreenTurnedOn(mKeyguardShowCallback);
- break;
- case R.id.on_screen_turned_off:
- mService.onScreenTurnedOff(WindowManagerPolicy.OFF_BECAUSE_OF_USER);
- break;
- case R.id.do_keyguard:
- if (!mSentSystemReady) {
- mSentSystemReady = true;
- mService.onSystemReady();
- }
- mService.doKeyguardTimeout(null);
- break;
- case R.id.verify_unlock:
- mService.doKeyguardTimeout(null);
- // Wait for keyguard to lock and then try this...
- mHandler.postDelayed(new Runnable() {
- @Override
- public void run() {
- try {
- mService.verifyUnlock(mKeyguardExitCallback);
- } catch (RemoteException e) {
- Log.e(TAG, "Failed verifyUnlock()", e);
- }
- }
- }, 5000);
- break;
- }
- } catch (RemoteException e) {
- Log.e(TAG, "onClick(): Failed due to remote exeption", e);
- }
- }
-
- @Override
- protected void onPause() {
- super.onPause();
- try {
- if (mService != null) {
- mService.setHidden(true);
- }
- } catch (RemoteException e) {
- Log.e(TAG, "Remote service died");
- e.printStackTrace();
- }
- }
-
- protected void onResume() {
- super.onResume();
- try {
- if (mService != null) {
- mService.setHidden(false);
- }
- } catch (RemoteException e) {
- Log.e(TAG, "Remote service died");
- e.printStackTrace();
- }
- }
-
- public int mSecurityModeMock;
- private boolean mTestSimPin;
- private boolean mTestSimPuk;
- private boolean mLockPasswordEnabled;
- public boolean mLockPatternEnabled;
- private int mSecurityMode;
-
- class LockPatternUtilsMock extends LockPatternUtils {
- private long mDeadline;
- public LockPatternUtilsMock(Context context) {
- super(context);
- }
-
- @Override
- public boolean checkPattern(List<Cell> pattern) {
- return pattern.size() > 4;
- }
-
- @Override
- public boolean checkPassword(String password) {
- return password.length() > 4;
- }
- @Override
- public long setLockoutAttemptDeadline() {
- final long deadline = SystemClock.elapsedRealtime() + FAILED_ATTEMPT_TIMEOUT_MS;
- mDeadline = deadline;
- return deadline;
- }
- @Override
- public boolean isLockScreenDisabled() {
- return false;
- }
- @Override
- public long getLockoutAttemptDeadline() {
- return mDeadline;
- }
- @Override
- public void reportFailedPasswordAttempt() {
- // Ignored
- }
- @Override
- public void reportSuccessfulPasswordAttempt() {
- // Ignored
- }
- @Override
- public boolean isLockPatternEnabled() {
- return mLockPatternEnabled;
- }
-
- @Override
- public boolean isLockPasswordEnabled() {
- return mLockPasswordEnabled;
- }
-
- @Override
- public int getKeyguardStoredPasswordQuality() {
- return mSecurityModeMock;
- }
-
- public boolean isSecure() {
- return mLockPatternEnabled || mLockPasswordEnabled || mTestSimPin || mTestSimPuk;
- }
-
- }
-}
diff --git a/packages/Shell/src/com/android/shell/BugreportProgressService.java b/packages/Shell/src/com/android/shell/BugreportProgressService.java
index 26568cc..37ea537 100644
--- a/packages/Shell/src/com/android/shell/BugreportProgressService.java
+++ b/packages/Shell/src/com/android/shell/BugreportProgressService.java
@@ -92,6 +92,7 @@
import android.util.Pair;
import android.util.Patterns;
import android.util.SparseArray;
+import android.view.IWindowManager;
import android.view.View;
import android.view.WindowManager;
import android.view.View.OnFocusChangeListener;
@@ -579,6 +580,16 @@
}
collapseNotificationBar();
+
+ // Dissmiss keyguard first.
+ final IWindowManager wm = IWindowManager.Stub
+ .asInterface(ServiceManager.getService(Context.WINDOW_SERVICE));
+ try {
+ wm.dismissKeyguard(null);
+ } catch (Exception e) {
+ // ignore it
+ }
+
mInfoDialog.initialize(mContext, info);
}
diff --git a/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java b/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java
index 4e3744a..823b9b1 100644
--- a/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java
+++ b/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java
@@ -695,6 +695,7 @@
private void sendBugreportStarted(int id, int pid, String name, int max) throws Exception {
Intent intent = new Intent(INTENT_BUGREPORT_STARTED);
+ intent.setPackage("com.android.shell");
intent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND);
intent.putExtra(EXTRA_ID, id);
intent.putExtra(EXTRA_PID, pid);
@@ -754,6 +755,7 @@
*/
private void sendBugreportFinished(int id, String bugreportPath, String screenshotPath) {
Intent intent = new Intent(INTENT_BUGREPORT_FINISHED);
+ intent.setPackage("com.android.shell");
intent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND);
if (id != NO_ID) {
intent.putExtra(EXTRA_ID, id);
diff --git a/packages/SystemUI/Android.mk b/packages/SystemUI/Android.mk
index d1e1060..1ebfbad 100644
--- a/packages/SystemUI/Android.mk
+++ b/packages/SystemUI/Android.mk
@@ -11,6 +11,14 @@
include $(BUILD_STATIC_JAVA_LIBRARY)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := SystemUI-tags
+
+LOCAL_SRC_FILES := src/com/android/systemui/EventLogTags.logtags
+
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
# ------------------
include $(CLEAR_VARS)
@@ -23,7 +31,6 @@
LOCAL_STATIC_ANDROID_LIBRARIES := \
SystemUIPluginLib \
- Keyguard \
android-support-v7-recyclerview \
android-support-v7-preference \
android-support-v7-appcompat \
@@ -32,6 +39,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
framework-protos \
+ SystemUI-tags \
SystemUI-proto
LOCAL_JAVA_LIBRARIES := telephony-common
@@ -42,6 +50,7 @@
LOCAL_PRIVILEGED_MODULE := true
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res-keyguard $(LOCAL_PATH)/res
ifneq ($(INCREMENTAL_BUILDS),)
LOCAL_PROGUARD_ENABLED := disabled
@@ -52,6 +61,8 @@
include frameworks/base/packages/SettingsLib/common.mk
+LOCAL_AAPT_FLAGS := --extra-packages com.android.keyguard
+
include $(BUILD_PACKAGE)
include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/packages/Keyguard/res/drawable-hdpi/ic_done_wht.png b/packages/SystemUI/res-keyguard/drawable-hdpi/ic_done_wht.png
similarity index 100%
rename from packages/Keyguard/res/drawable-hdpi/ic_done_wht.png
rename to packages/SystemUI/res-keyguard/drawable-hdpi/ic_done_wht.png
Binary files differ
diff --git a/packages/Keyguard/res/drawable-hdpi/ic_lockscreen_sim.png b/packages/SystemUI/res-keyguard/drawable-hdpi/ic_lockscreen_sim.png
similarity index 100%
rename from packages/Keyguard/res/drawable-hdpi/ic_lockscreen_sim.png
rename to packages/SystemUI/res-keyguard/drawable-hdpi/ic_lockscreen_sim.png
Binary files differ
diff --git a/packages/Keyguard/res/drawable-hdpi/kg_security_lock_normal.png b/packages/SystemUI/res-keyguard/drawable-hdpi/kg_security_lock_normal.png
similarity index 100%
rename from packages/Keyguard/res/drawable-hdpi/kg_security_lock_normal.png
rename to packages/SystemUI/res-keyguard/drawable-hdpi/kg_security_lock_normal.png
Binary files differ
diff --git a/packages/Keyguard/res/drawable-mdpi/ic_done_wht.png b/packages/SystemUI/res-keyguard/drawable-mdpi/ic_done_wht.png
similarity index 100%
rename from packages/Keyguard/res/drawable-mdpi/ic_done_wht.png
rename to packages/SystemUI/res-keyguard/drawable-mdpi/ic_done_wht.png
Binary files differ
diff --git a/packages/Keyguard/res/drawable-mdpi/ic_lockscreen_sim.png b/packages/SystemUI/res-keyguard/drawable-mdpi/ic_lockscreen_sim.png
similarity index 100%
rename from packages/Keyguard/res/drawable-mdpi/ic_lockscreen_sim.png
rename to packages/SystemUI/res-keyguard/drawable-mdpi/ic_lockscreen_sim.png
Binary files differ
diff --git a/packages/Keyguard/res/drawable-mdpi/kg_security_lock_normal.png b/packages/SystemUI/res-keyguard/drawable-mdpi/kg_security_lock_normal.png
similarity index 100%
rename from packages/Keyguard/res/drawable-mdpi/kg_security_lock_normal.png
rename to packages/SystemUI/res-keyguard/drawable-mdpi/kg_security_lock_normal.png
Binary files differ
diff --git a/packages/Keyguard/res/drawable-xhdpi/ic_done_wht.png b/packages/SystemUI/res-keyguard/drawable-xhdpi/ic_done_wht.png
similarity index 100%
rename from packages/Keyguard/res/drawable-xhdpi/ic_done_wht.png
rename to packages/SystemUI/res-keyguard/drawable-xhdpi/ic_done_wht.png
Binary files differ
diff --git a/packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_sim.png b/packages/SystemUI/res-keyguard/drawable-xhdpi/ic_lockscreen_sim.png
similarity index 100%
rename from packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_sim.png
rename to packages/SystemUI/res-keyguard/drawable-xhdpi/ic_lockscreen_sim.png
Binary files differ
diff --git a/packages/Keyguard/res/drawable-xhdpi/kg_security_lock_normal.png b/packages/SystemUI/res-keyguard/drawable-xhdpi/kg_security_lock_normal.png
similarity index 100%
rename from packages/Keyguard/res/drawable-xhdpi/kg_security_lock_normal.png
rename to packages/SystemUI/res-keyguard/drawable-xhdpi/kg_security_lock_normal.png
Binary files differ
diff --git a/packages/Keyguard/res/drawable-xxhdpi/ic_done_wht.png b/packages/SystemUI/res-keyguard/drawable-xxhdpi/ic_done_wht.png
similarity index 100%
rename from packages/Keyguard/res/drawable-xxhdpi/ic_done_wht.png
rename to packages/SystemUI/res-keyguard/drawable-xxhdpi/ic_done_wht.png
Binary files differ
diff --git a/packages/Keyguard/res/drawable-xxxhdpi/ic_done_wht.png b/packages/SystemUI/res-keyguard/drawable-xxxhdpi/ic_done_wht.png
similarity index 100%
rename from packages/Keyguard/res/drawable-xxxhdpi/ic_done_wht.png
rename to packages/SystemUI/res-keyguard/drawable-xxxhdpi/ic_done_wht.png
Binary files differ
diff --git a/packages/Keyguard/res/drawable/ic_access_alarms_big.xml b/packages/SystemUI/res-keyguard/drawable/ic_access_alarms_big.xml
similarity index 100%
rename from packages/Keyguard/res/drawable/ic_access_alarms_big.xml
rename to packages/SystemUI/res-keyguard/drawable/ic_access_alarms_big.xml
diff --git a/packages/Keyguard/res/drawable/ic_backspace_24dp.xml b/packages/SystemUI/res-keyguard/drawable/ic_backspace_24dp.xml
similarity index 100%
rename from packages/Keyguard/res/drawable/ic_backspace_24dp.xml
rename to packages/SystemUI/res-keyguard/drawable/ic_backspace_24dp.xml
diff --git a/packages/Keyguard/res/drawable/ic_lockscreen_ime.xml b/packages/SystemUI/res-keyguard/drawable/ic_lockscreen_ime.xml
similarity index 100%
rename from packages/Keyguard/res/drawable/ic_lockscreen_ime.xml
rename to packages/SystemUI/res-keyguard/drawable/ic_lockscreen_ime.xml
diff --git a/packages/Keyguard/res/drawable/ripple_drawable.xml b/packages/SystemUI/res-keyguard/drawable/ripple_drawable.xml
similarity index 100%
rename from packages/Keyguard/res/drawable/ripple_drawable.xml
rename to packages/SystemUI/res-keyguard/drawable/ripple_drawable.xml
diff --git a/packages/Keyguard/res/layout/keyguard_bouncer.xml b/packages/SystemUI/res-keyguard/layout/keyguard_bouncer.xml
similarity index 100%
rename from packages/Keyguard/res/layout/keyguard_bouncer.xml
rename to packages/SystemUI/res-keyguard/layout/keyguard_bouncer.xml
diff --git a/packages/Keyguard/res/layout/keyguard_emergency_carrier_area.xml b/packages/SystemUI/res-keyguard/layout/keyguard_emergency_carrier_area.xml
similarity index 100%
rename from packages/Keyguard/res/layout/keyguard_emergency_carrier_area.xml
rename to packages/SystemUI/res-keyguard/layout/keyguard_emergency_carrier_area.xml
diff --git a/packages/Keyguard/res/layout/keyguard_host_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_host_view.xml
similarity index 100%
rename from packages/Keyguard/res/layout/keyguard_host_view.xml
rename to packages/SystemUI/res-keyguard/layout/keyguard_host_view.xml
diff --git a/packages/Keyguard/res/layout/keyguard_message_area.xml b/packages/SystemUI/res-keyguard/layout/keyguard_message_area.xml
similarity index 100%
rename from packages/Keyguard/res/layout/keyguard_message_area.xml
rename to packages/SystemUI/res-keyguard/layout/keyguard_message_area.xml
diff --git a/packages/Keyguard/res/layout/keyguard_message_area_large.xml b/packages/SystemUI/res-keyguard/layout/keyguard_message_area_large.xml
similarity index 100%
rename from packages/Keyguard/res/layout/keyguard_message_area_large.xml
rename to packages/SystemUI/res-keyguard/layout/keyguard_message_area_large.xml
diff --git a/packages/Keyguard/res/layout/keyguard_num_pad_key.xml b/packages/SystemUI/res-keyguard/layout/keyguard_num_pad_key.xml
similarity index 100%
rename from packages/Keyguard/res/layout/keyguard_num_pad_key.xml
rename to packages/SystemUI/res-keyguard/layout/keyguard_num_pad_key.xml
diff --git a/packages/Keyguard/res/layout/keyguard_password_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_password_view.xml
similarity index 100%
rename from packages/Keyguard/res/layout/keyguard_password_view.xml
rename to packages/SystemUI/res-keyguard/layout/keyguard_password_view.xml
diff --git a/packages/Keyguard/res/layout/keyguard_pattern_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_pattern_view.xml
similarity index 100%
rename from packages/Keyguard/res/layout/keyguard_pattern_view.xml
rename to packages/SystemUI/res-keyguard/layout/keyguard_pattern_view.xml
diff --git a/packages/Keyguard/res/layout/keyguard_pin_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml
similarity index 100%
rename from packages/Keyguard/res/layout/keyguard_pin_view.xml
rename to packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml
diff --git a/packages/Keyguard/res/layout/keyguard_presentation.xml b/packages/SystemUI/res-keyguard/layout/keyguard_presentation.xml
similarity index 100%
rename from packages/Keyguard/res/layout/keyguard_presentation.xml
rename to packages/SystemUI/res-keyguard/layout/keyguard_presentation.xml
diff --git a/packages/Keyguard/res/layout/keyguard_sim_pin_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_sim_pin_view.xml
similarity index 100%
rename from packages/Keyguard/res/layout/keyguard_sim_pin_view.xml
rename to packages/SystemUI/res-keyguard/layout/keyguard_sim_pin_view.xml
diff --git a/packages/Keyguard/res/layout/keyguard_sim_puk_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_sim_puk_view.xml
similarity index 100%
rename from packages/Keyguard/res/layout/keyguard_sim_puk_view.xml
rename to packages/SystemUI/res-keyguard/layout/keyguard_sim_puk_view.xml
diff --git a/packages/Keyguard/res/layout/keyguard_status_area.xml b/packages/SystemUI/res-keyguard/layout/keyguard_status_area.xml
similarity index 100%
rename from packages/Keyguard/res/layout/keyguard_status_area.xml
rename to packages/SystemUI/res-keyguard/layout/keyguard_status_area.xml
diff --git a/packages/Keyguard/res/layout/keyguard_status_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_status_view.xml
similarity index 100%
rename from packages/Keyguard/res/layout/keyguard_status_view.xml
rename to packages/SystemUI/res-keyguard/layout/keyguard_status_view.xml
diff --git a/packages/Keyguard/res/values-af/strings.xml b/packages/SystemUI/res-keyguard/values-af/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-af/strings.xml
rename to packages/SystemUI/res-keyguard/values-af/strings.xml
diff --git a/packages/Keyguard/res/values-am/strings.xml b/packages/SystemUI/res-keyguard/values-am/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-am/strings.xml
rename to packages/SystemUI/res-keyguard/values-am/strings.xml
diff --git a/packages/Keyguard/res/values-ar/strings.xml b/packages/SystemUI/res-keyguard/values-ar/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ar/strings.xml
rename to packages/SystemUI/res-keyguard/values-ar/strings.xml
diff --git a/packages/Keyguard/res/values-az/strings.xml b/packages/SystemUI/res-keyguard/values-az/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-az/strings.xml
rename to packages/SystemUI/res-keyguard/values-az/strings.xml
diff --git a/packages/Keyguard/res/values-b+sr+Latn/strings.xml b/packages/SystemUI/res-keyguard/values-b+sr+Latn/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-b+sr+Latn/strings.xml
rename to packages/SystemUI/res-keyguard/values-b+sr+Latn/strings.xml
diff --git a/packages/Keyguard/res/values-be/strings.xml b/packages/SystemUI/res-keyguard/values-be/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-be/strings.xml
rename to packages/SystemUI/res-keyguard/values-be/strings.xml
diff --git a/packages/Keyguard/res/values-bg/strings.xml b/packages/SystemUI/res-keyguard/values-bg/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-bg/strings.xml
rename to packages/SystemUI/res-keyguard/values-bg/strings.xml
diff --git a/packages/Keyguard/res/values-bn/strings.xml b/packages/SystemUI/res-keyguard/values-bn/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-bn/strings.xml
rename to packages/SystemUI/res-keyguard/values-bn/strings.xml
diff --git a/packages/Keyguard/res/values-bs/strings.xml b/packages/SystemUI/res-keyguard/values-bs/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-bs/strings.xml
rename to packages/SystemUI/res-keyguard/values-bs/strings.xml
diff --git a/packages/Keyguard/res/values-ca/strings.xml b/packages/SystemUI/res-keyguard/values-ca/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ca/strings.xml
rename to packages/SystemUI/res-keyguard/values-ca/strings.xml
diff --git a/packages/Keyguard/res/values-cs/strings.xml b/packages/SystemUI/res-keyguard/values-cs/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-cs/strings.xml
rename to packages/SystemUI/res-keyguard/values-cs/strings.xml
diff --git a/packages/Keyguard/res/values-da/strings.xml b/packages/SystemUI/res-keyguard/values-da/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-da/strings.xml
rename to packages/SystemUI/res-keyguard/values-da/strings.xml
diff --git a/packages/Keyguard/res/values-de/strings.xml b/packages/SystemUI/res-keyguard/values-de/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-de/strings.xml
rename to packages/SystemUI/res-keyguard/values-de/strings.xml
diff --git a/packages/Keyguard/res/values-el/strings.xml b/packages/SystemUI/res-keyguard/values-el/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-el/strings.xml
rename to packages/SystemUI/res-keyguard/values-el/strings.xml
diff --git a/packages/Keyguard/res/values-en-rAU/strings.xml b/packages/SystemUI/res-keyguard/values-en-rAU/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-en-rAU/strings.xml
rename to packages/SystemUI/res-keyguard/values-en-rAU/strings.xml
diff --git a/packages/Keyguard/res/values-en-rGB/strings.xml b/packages/SystemUI/res-keyguard/values-en-rGB/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-en-rGB/strings.xml
rename to packages/SystemUI/res-keyguard/values-en-rGB/strings.xml
diff --git a/packages/Keyguard/res/values-en-rIN/strings.xml b/packages/SystemUI/res-keyguard/values-en-rIN/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-en-rIN/strings.xml
rename to packages/SystemUI/res-keyguard/values-en-rIN/strings.xml
diff --git a/packages/Keyguard/res/values-es-rUS/strings.xml b/packages/SystemUI/res-keyguard/values-es-rUS/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-es-rUS/strings.xml
rename to packages/SystemUI/res-keyguard/values-es-rUS/strings.xml
diff --git a/packages/Keyguard/res/values-es/strings.xml b/packages/SystemUI/res-keyguard/values-es/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-es/strings.xml
rename to packages/SystemUI/res-keyguard/values-es/strings.xml
diff --git a/packages/Keyguard/res/values-et/strings.xml b/packages/SystemUI/res-keyguard/values-et/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-et/strings.xml
rename to packages/SystemUI/res-keyguard/values-et/strings.xml
diff --git a/packages/Keyguard/res/values-eu/strings.xml b/packages/SystemUI/res-keyguard/values-eu/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-eu/strings.xml
rename to packages/SystemUI/res-keyguard/values-eu/strings.xml
diff --git a/packages/Keyguard/res/values-fa/strings.xml b/packages/SystemUI/res-keyguard/values-fa/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-fa/strings.xml
rename to packages/SystemUI/res-keyguard/values-fa/strings.xml
diff --git a/packages/Keyguard/res/values-fi/strings.xml b/packages/SystemUI/res-keyguard/values-fi/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-fi/strings.xml
rename to packages/SystemUI/res-keyguard/values-fi/strings.xml
diff --git a/packages/Keyguard/res/values-fr-rCA/strings.xml b/packages/SystemUI/res-keyguard/values-fr-rCA/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-fr-rCA/strings.xml
rename to packages/SystemUI/res-keyguard/values-fr-rCA/strings.xml
diff --git a/packages/Keyguard/res/values-fr/strings.xml b/packages/SystemUI/res-keyguard/values-fr/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-fr/strings.xml
rename to packages/SystemUI/res-keyguard/values-fr/strings.xml
diff --git a/packages/Keyguard/res/values-gl/strings.xml b/packages/SystemUI/res-keyguard/values-gl/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-gl/strings.xml
rename to packages/SystemUI/res-keyguard/values-gl/strings.xml
diff --git a/packages/Keyguard/res/values-gu/strings.xml b/packages/SystemUI/res-keyguard/values-gu/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-gu/strings.xml
rename to packages/SystemUI/res-keyguard/values-gu/strings.xml
diff --git a/packages/Keyguard/res/values-h560dp/dimens.xml b/packages/SystemUI/res-keyguard/values-h560dp/dimens.xml
similarity index 100%
rename from packages/Keyguard/res/values-h560dp/dimens.xml
rename to packages/SystemUI/res-keyguard/values-h560dp/dimens.xml
diff --git a/packages/Keyguard/res/values-h650dp/dimens.xml b/packages/SystemUI/res-keyguard/values-h650dp/dimens.xml
similarity index 100%
rename from packages/Keyguard/res/values-h650dp/dimens.xml
rename to packages/SystemUI/res-keyguard/values-h650dp/dimens.xml
diff --git a/packages/Keyguard/res/values-hi/strings.xml b/packages/SystemUI/res-keyguard/values-hi/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-hi/strings.xml
rename to packages/SystemUI/res-keyguard/values-hi/strings.xml
diff --git a/packages/Keyguard/res/values-hr/strings.xml b/packages/SystemUI/res-keyguard/values-hr/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-hr/strings.xml
rename to packages/SystemUI/res-keyguard/values-hr/strings.xml
diff --git a/packages/Keyguard/res/values-hu/strings.xml b/packages/SystemUI/res-keyguard/values-hu/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-hu/strings.xml
rename to packages/SystemUI/res-keyguard/values-hu/strings.xml
diff --git a/packages/Keyguard/res/values-hy/strings.xml b/packages/SystemUI/res-keyguard/values-hy/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-hy/strings.xml
rename to packages/SystemUI/res-keyguard/values-hy/strings.xml
diff --git a/packages/Keyguard/res/values-in/strings.xml b/packages/SystemUI/res-keyguard/values-in/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-in/strings.xml
rename to packages/SystemUI/res-keyguard/values-in/strings.xml
diff --git a/packages/Keyguard/res/values-is/strings.xml b/packages/SystemUI/res-keyguard/values-is/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-is/strings.xml
rename to packages/SystemUI/res-keyguard/values-is/strings.xml
diff --git a/packages/Keyguard/res/values-it/strings.xml b/packages/SystemUI/res-keyguard/values-it/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-it/strings.xml
rename to packages/SystemUI/res-keyguard/values-it/strings.xml
diff --git a/packages/Keyguard/res/values-iw/strings.xml b/packages/SystemUI/res-keyguard/values-iw/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-iw/strings.xml
rename to packages/SystemUI/res-keyguard/values-iw/strings.xml
diff --git a/packages/Keyguard/res/values-ja/strings.xml b/packages/SystemUI/res-keyguard/values-ja/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ja/strings.xml
rename to packages/SystemUI/res-keyguard/values-ja/strings.xml
diff --git a/packages/Keyguard/res/values-ka/strings.xml b/packages/SystemUI/res-keyguard/values-ka/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ka/strings.xml
rename to packages/SystemUI/res-keyguard/values-ka/strings.xml
diff --git a/packages/Keyguard/res/values-kk/strings.xml b/packages/SystemUI/res-keyguard/values-kk/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-kk/strings.xml
rename to packages/SystemUI/res-keyguard/values-kk/strings.xml
diff --git a/packages/Keyguard/res/values-km/strings.xml b/packages/SystemUI/res-keyguard/values-km/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-km/strings.xml
rename to packages/SystemUI/res-keyguard/values-km/strings.xml
diff --git a/packages/Keyguard/res/values-kn/strings.xml b/packages/SystemUI/res-keyguard/values-kn/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-kn/strings.xml
rename to packages/SystemUI/res-keyguard/values-kn/strings.xml
diff --git a/packages/Keyguard/res/values-ko/strings.xml b/packages/SystemUI/res-keyguard/values-ko/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ko/strings.xml
rename to packages/SystemUI/res-keyguard/values-ko/strings.xml
diff --git a/packages/Keyguard/res/values-ky/strings.xml b/packages/SystemUI/res-keyguard/values-ky/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ky/strings.xml
rename to packages/SystemUI/res-keyguard/values-ky/strings.xml
diff --git a/packages/Keyguard/res/values-land/bools.xml b/packages/SystemUI/res-keyguard/values-land/bools.xml
similarity index 100%
rename from packages/Keyguard/res/values-land/bools.xml
rename to packages/SystemUI/res-keyguard/values-land/bools.xml
diff --git a/packages/Keyguard/res/values-land/integers.xml b/packages/SystemUI/res-keyguard/values-land/integers.xml
similarity index 100%
rename from packages/Keyguard/res/values-land/integers.xml
rename to packages/SystemUI/res-keyguard/values-land/integers.xml
diff --git a/packages/Keyguard/res/values-lo/strings.xml b/packages/SystemUI/res-keyguard/values-lo/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-lo/strings.xml
rename to packages/SystemUI/res-keyguard/values-lo/strings.xml
diff --git a/packages/Keyguard/res/values-lt/strings.xml b/packages/SystemUI/res-keyguard/values-lt/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-lt/strings.xml
rename to packages/SystemUI/res-keyguard/values-lt/strings.xml
diff --git a/packages/Keyguard/res/values-lv/strings.xml b/packages/SystemUI/res-keyguard/values-lv/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-lv/strings.xml
rename to packages/SystemUI/res-keyguard/values-lv/strings.xml
diff --git a/packages/Keyguard/res/values-mcc262-mnc07/bools.xml b/packages/SystemUI/res-keyguard/values-mcc262-mnc07/bools.xml
similarity index 100%
rename from packages/Keyguard/res/values-mcc262-mnc07/bools.xml
rename to packages/SystemUI/res-keyguard/values-mcc262-mnc07/bools.xml
diff --git a/packages/Keyguard/res/values-mcc262-mnc08/bools.xml b/packages/SystemUI/res-keyguard/values-mcc262-mnc08/bools.xml
similarity index 100%
rename from packages/Keyguard/res/values-mcc262-mnc08/bools.xml
rename to packages/SystemUI/res-keyguard/values-mcc262-mnc08/bools.xml
diff --git a/packages/Keyguard/res/values-mcc262-mnc11/bools.xml b/packages/SystemUI/res-keyguard/values-mcc262-mnc11/bools.xml
similarity index 100%
rename from packages/Keyguard/res/values-mcc262-mnc11/bools.xml
rename to packages/SystemUI/res-keyguard/values-mcc262-mnc11/bools.xml
diff --git a/packages/Keyguard/res/values-mk/strings.xml b/packages/SystemUI/res-keyguard/values-mk/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-mk/strings.xml
rename to packages/SystemUI/res-keyguard/values-mk/strings.xml
diff --git a/packages/Keyguard/res/values-ml/strings.xml b/packages/SystemUI/res-keyguard/values-ml/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ml/strings.xml
rename to packages/SystemUI/res-keyguard/values-ml/strings.xml
diff --git a/packages/Keyguard/res/values-mn/strings.xml b/packages/SystemUI/res-keyguard/values-mn/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-mn/strings.xml
rename to packages/SystemUI/res-keyguard/values-mn/strings.xml
diff --git a/packages/Keyguard/res/values-mr/strings.xml b/packages/SystemUI/res-keyguard/values-mr/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-mr/strings.xml
rename to packages/SystemUI/res-keyguard/values-mr/strings.xml
diff --git a/packages/Keyguard/res/values-ms/strings.xml b/packages/SystemUI/res-keyguard/values-ms/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ms/strings.xml
rename to packages/SystemUI/res-keyguard/values-ms/strings.xml
diff --git a/packages/Keyguard/res/values-my/dimens.xml b/packages/SystemUI/res-keyguard/values-my/dimens.xml
similarity index 100%
rename from packages/Keyguard/res/values-my/dimens.xml
rename to packages/SystemUI/res-keyguard/values-my/dimens.xml
diff --git a/packages/Keyguard/res/values-my/strings.xml b/packages/SystemUI/res-keyguard/values-my/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-my/strings.xml
rename to packages/SystemUI/res-keyguard/values-my/strings.xml
diff --git a/packages/Keyguard/res/values-nb/strings.xml b/packages/SystemUI/res-keyguard/values-nb/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-nb/strings.xml
rename to packages/SystemUI/res-keyguard/values-nb/strings.xml
diff --git a/packages/Keyguard/res/values-ne/strings.xml b/packages/SystemUI/res-keyguard/values-ne/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ne/strings.xml
rename to packages/SystemUI/res-keyguard/values-ne/strings.xml
diff --git a/packages/Keyguard/res/values-nl/strings.xml b/packages/SystemUI/res-keyguard/values-nl/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-nl/strings.xml
rename to packages/SystemUI/res-keyguard/values-nl/strings.xml
diff --git a/packages/Keyguard/res/values-pa/strings.xml b/packages/SystemUI/res-keyguard/values-pa/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-pa/strings.xml
rename to packages/SystemUI/res-keyguard/values-pa/strings.xml
diff --git a/packages/Keyguard/res/values-pl/strings.xml b/packages/SystemUI/res-keyguard/values-pl/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-pl/strings.xml
rename to packages/SystemUI/res-keyguard/values-pl/strings.xml
diff --git a/packages/Keyguard/res/values-port/bools.xml b/packages/SystemUI/res-keyguard/values-port/bools.xml
similarity index 100%
rename from packages/Keyguard/res/values-port/bools.xml
rename to packages/SystemUI/res-keyguard/values-port/bools.xml
diff --git a/packages/Keyguard/res/values-port/integers.xml b/packages/SystemUI/res-keyguard/values-port/integers.xml
similarity index 100%
rename from packages/Keyguard/res/values-port/integers.xml
rename to packages/SystemUI/res-keyguard/values-port/integers.xml
diff --git a/packages/Keyguard/res/values-pt-rBR/strings.xml b/packages/SystemUI/res-keyguard/values-pt-rBR/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-pt-rBR/strings.xml
rename to packages/SystemUI/res-keyguard/values-pt-rBR/strings.xml
diff --git a/packages/Keyguard/res/values-pt-rPT/strings.xml b/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-pt-rPT/strings.xml
rename to packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml
diff --git a/packages/Keyguard/res/values-pt/strings.xml b/packages/SystemUI/res-keyguard/values-pt/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-pt/strings.xml
rename to packages/SystemUI/res-keyguard/values-pt/strings.xml
diff --git a/packages/Keyguard/res/values-ro/strings.xml b/packages/SystemUI/res-keyguard/values-ro/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ro/strings.xml
rename to packages/SystemUI/res-keyguard/values-ro/strings.xml
diff --git a/packages/Keyguard/res/values-ru/strings.xml b/packages/SystemUI/res-keyguard/values-ru/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ru/strings.xml
rename to packages/SystemUI/res-keyguard/values-ru/strings.xml
diff --git a/packages/Keyguard/res/values-si/strings.xml b/packages/SystemUI/res-keyguard/values-si/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-si/strings.xml
rename to packages/SystemUI/res-keyguard/values-si/strings.xml
diff --git a/packages/Keyguard/res/values-sk/strings.xml b/packages/SystemUI/res-keyguard/values-sk/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-sk/strings.xml
rename to packages/SystemUI/res-keyguard/values-sk/strings.xml
diff --git a/packages/Keyguard/res/values-sl/strings.xml b/packages/SystemUI/res-keyguard/values-sl/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-sl/strings.xml
rename to packages/SystemUI/res-keyguard/values-sl/strings.xml
diff --git a/packages/Keyguard/res/values-sq/strings.xml b/packages/SystemUI/res-keyguard/values-sq/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-sq/strings.xml
rename to packages/SystemUI/res-keyguard/values-sq/strings.xml
diff --git a/packages/Keyguard/res/values-sr/strings.xml b/packages/SystemUI/res-keyguard/values-sr/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-sr/strings.xml
rename to packages/SystemUI/res-keyguard/values-sr/strings.xml
diff --git a/packages/Keyguard/res/values-sv/strings.xml b/packages/SystemUI/res-keyguard/values-sv/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-sv/strings.xml
rename to packages/SystemUI/res-keyguard/values-sv/strings.xml
diff --git a/packages/Keyguard/res/values-sw/strings.xml b/packages/SystemUI/res-keyguard/values-sw/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-sw/strings.xml
rename to packages/SystemUI/res-keyguard/values-sw/strings.xml
diff --git a/packages/Keyguard/res/values-sw320dp/dimens.xml b/packages/SystemUI/res-keyguard/values-sw320dp/dimens.xml
similarity index 100%
rename from packages/Keyguard/res/values-sw320dp/dimens.xml
rename to packages/SystemUI/res-keyguard/values-sw320dp/dimens.xml
diff --git a/packages/Keyguard/res/values-sw360dp/dimens.xml b/packages/SystemUI/res-keyguard/values-sw360dp/dimens.xml
similarity index 100%
rename from packages/Keyguard/res/values-sw360dp/dimens.xml
rename to packages/SystemUI/res-keyguard/values-sw360dp/dimens.xml
diff --git a/packages/Keyguard/res/values-sw380dp/dimens.xml b/packages/SystemUI/res-keyguard/values-sw380dp/dimens.xml
similarity index 100%
rename from packages/Keyguard/res/values-sw380dp/dimens.xml
rename to packages/SystemUI/res-keyguard/values-sw380dp/dimens.xml
diff --git a/packages/Keyguard/res/values-sw540dp-port/dimens.xml b/packages/SystemUI/res-keyguard/values-sw540dp-port/dimens.xml
similarity index 100%
rename from packages/Keyguard/res/values-sw540dp-port/dimens.xml
rename to packages/SystemUI/res-keyguard/values-sw540dp-port/dimens.xml
diff --git a/packages/Keyguard/res/values-sw600dp-land/dimens.xml b/packages/SystemUI/res-keyguard/values-sw600dp-land/dimens.xml
similarity index 100%
rename from packages/Keyguard/res/values-sw600dp-land/dimens.xml
rename to packages/SystemUI/res-keyguard/values-sw600dp-land/dimens.xml
diff --git a/packages/Keyguard/res/values-sw600dp/alias.xml b/packages/SystemUI/res-keyguard/values-sw600dp/alias.xml
similarity index 100%
rename from packages/Keyguard/res/values-sw600dp/alias.xml
rename to packages/SystemUI/res-keyguard/values-sw600dp/alias.xml
diff --git a/packages/Keyguard/res/values-sw600dp/bools.xml b/packages/SystemUI/res-keyguard/values-sw600dp/bools.xml
similarity index 100%
rename from packages/Keyguard/res/values-sw600dp/bools.xml
rename to packages/SystemUI/res-keyguard/values-sw600dp/bools.xml
diff --git a/packages/Keyguard/res/values-sw600dp/dimens.xml b/packages/SystemUI/res-keyguard/values-sw600dp/dimens.xml
similarity index 100%
rename from packages/Keyguard/res/values-sw600dp/dimens.xml
rename to packages/SystemUI/res-keyguard/values-sw600dp/dimens.xml
diff --git a/packages/Keyguard/res/values-sw600dp/styles.xml b/packages/SystemUI/res-keyguard/values-sw600dp/styles.xml
similarity index 100%
rename from packages/Keyguard/res/values-sw600dp/styles.xml
rename to packages/SystemUI/res-keyguard/values-sw600dp/styles.xml
diff --git a/packages/Keyguard/res/values-sw720dp/dimens.xml b/packages/SystemUI/res-keyguard/values-sw720dp/dimens.xml
similarity index 100%
rename from packages/Keyguard/res/values-sw720dp/dimens.xml
rename to packages/SystemUI/res-keyguard/values-sw720dp/dimens.xml
diff --git a/packages/Keyguard/res/values-ta/strings.xml b/packages/SystemUI/res-keyguard/values-ta/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ta/strings.xml
rename to packages/SystemUI/res-keyguard/values-ta/strings.xml
diff --git a/packages/Keyguard/res/values-te/strings.xml b/packages/SystemUI/res-keyguard/values-te/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-te/strings.xml
rename to packages/SystemUI/res-keyguard/values-te/strings.xml
diff --git a/packages/Keyguard/res/values-th/strings.xml b/packages/SystemUI/res-keyguard/values-th/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-th/strings.xml
rename to packages/SystemUI/res-keyguard/values-th/strings.xml
diff --git a/packages/Keyguard/res/values-tl/strings.xml b/packages/SystemUI/res-keyguard/values-tl/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-tl/strings.xml
rename to packages/SystemUI/res-keyguard/values-tl/strings.xml
diff --git a/packages/Keyguard/res/values-tr/strings.xml b/packages/SystemUI/res-keyguard/values-tr/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-tr/strings.xml
rename to packages/SystemUI/res-keyguard/values-tr/strings.xml
diff --git a/packages/Keyguard/res/values-uk/strings.xml b/packages/SystemUI/res-keyguard/values-uk/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-uk/strings.xml
rename to packages/SystemUI/res-keyguard/values-uk/strings.xml
diff --git a/packages/Keyguard/res/values-ur/strings.xml b/packages/SystemUI/res-keyguard/values-ur/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ur/strings.xml
rename to packages/SystemUI/res-keyguard/values-ur/strings.xml
diff --git a/packages/Keyguard/res/values-uz/strings.xml b/packages/SystemUI/res-keyguard/values-uz/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-uz/strings.xml
rename to packages/SystemUI/res-keyguard/values-uz/strings.xml
diff --git a/packages/Keyguard/res/values-vi/strings.xml b/packages/SystemUI/res-keyguard/values-vi/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-vi/strings.xml
rename to packages/SystemUI/res-keyguard/values-vi/strings.xml
diff --git a/packages/Keyguard/res/values-zh-rCN/strings.xml b/packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-zh-rCN/strings.xml
rename to packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml
diff --git a/packages/Keyguard/res/values-zh-rHK/strings.xml b/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-zh-rHK/strings.xml
rename to packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml
diff --git a/packages/Keyguard/res/values-zh-rTW/strings.xml b/packages/SystemUI/res-keyguard/values-zh-rTW/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-zh-rTW/strings.xml
rename to packages/SystemUI/res-keyguard/values-zh-rTW/strings.xml
diff --git a/packages/Keyguard/res/values-zu/strings.xml b/packages/SystemUI/res-keyguard/values-zu/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-zu/strings.xml
rename to packages/SystemUI/res-keyguard/values-zu/strings.xml
diff --git a/packages/Keyguard/res/values/alias.xml b/packages/SystemUI/res-keyguard/values/alias.xml
similarity index 100%
rename from packages/Keyguard/res/values/alias.xml
rename to packages/SystemUI/res-keyguard/values/alias.xml
diff --git a/packages/Keyguard/res/values/arrays.xml b/packages/SystemUI/res-keyguard/values/arrays.xml
similarity index 100%
rename from packages/Keyguard/res/values/arrays.xml
rename to packages/SystemUI/res-keyguard/values/arrays.xml
diff --git a/packages/Keyguard/res/values/attrs.xml b/packages/SystemUI/res-keyguard/values/attrs.xml
similarity index 100%
rename from packages/Keyguard/res/values/attrs.xml
rename to packages/SystemUI/res-keyguard/values/attrs.xml
diff --git a/packages/Keyguard/res/values/bools.xml b/packages/SystemUI/res-keyguard/values/bools.xml
similarity index 100%
rename from packages/Keyguard/res/values/bools.xml
rename to packages/SystemUI/res-keyguard/values/bools.xml
diff --git a/packages/Keyguard/res/values/colors.xml b/packages/SystemUI/res-keyguard/values/colors.xml
similarity index 100%
rename from packages/Keyguard/res/values/colors.xml
rename to packages/SystemUI/res-keyguard/values/colors.xml
diff --git a/packages/Keyguard/res/values/config.xml b/packages/SystemUI/res-keyguard/values/config.xml
similarity index 100%
rename from packages/Keyguard/res/values/config.xml
rename to packages/SystemUI/res-keyguard/values/config.xml
diff --git a/packages/Keyguard/res/values/dimens.xml b/packages/SystemUI/res-keyguard/values/dimens.xml
similarity index 100%
rename from packages/Keyguard/res/values/dimens.xml
rename to packages/SystemUI/res-keyguard/values/dimens.xml
diff --git a/packages/Keyguard/res/values/donottranslate.xml b/packages/SystemUI/res-keyguard/values/donottranslate.xml
similarity index 100%
rename from packages/Keyguard/res/values/donottranslate.xml
rename to packages/SystemUI/res-keyguard/values/donottranslate.xml
diff --git a/packages/Keyguard/res/values/strings.xml b/packages/SystemUI/res-keyguard/values/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values/strings.xml
rename to packages/SystemUI/res-keyguard/values/strings.xml
diff --git a/packages/Keyguard/res/values/styles.xml b/packages/SystemUI/res-keyguard/values/styles.xml
similarity index 100%
rename from packages/Keyguard/res/values/styles.xml
rename to packages/SystemUI/res-keyguard/values/styles.xml
diff --git a/packages/Keyguard/scripts/copy_profile_icons.sh b/packages/SystemUI/scripts/copy_profile_icons.sh
similarity index 100%
rename from packages/Keyguard/scripts/copy_profile_icons.sh
rename to packages/SystemUI/scripts/copy_profile_icons.sh
diff --git a/packages/Keyguard/scripts/new_merge.py b/packages/SystemUI/scripts/new_merge.py
similarity index 100%
rename from packages/Keyguard/scripts/new_merge.py
rename to packages/SystemUI/scripts/new_merge.py
diff --git a/packages/Keyguard/src/com/android/keyguard/AlphaOptimizedImageButton.java b/packages/SystemUI/src/com/android/keyguard/AlphaOptimizedImageButton.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/AlphaOptimizedImageButton.java
rename to packages/SystemUI/src/com/android/keyguard/AlphaOptimizedImageButton.java
diff --git a/packages/Keyguard/src/com/android/keyguard/AlphaOptimizedLinearLayout.java b/packages/SystemUI/src/com/android/keyguard/AlphaOptimizedLinearLayout.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/AlphaOptimizedLinearLayout.java
rename to packages/SystemUI/src/com/android/keyguard/AlphaOptimizedLinearLayout.java
diff --git a/packages/Keyguard/src/com/android/keyguard/AlphaOptimizedRelativeLayout.java b/packages/SystemUI/src/com/android/keyguard/AlphaOptimizedRelativeLayout.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/AlphaOptimizedRelativeLayout.java
rename to packages/SystemUI/src/com/android/keyguard/AlphaOptimizedRelativeLayout.java
diff --git a/packages/Keyguard/src/com/android/keyguard/CarrierText.java b/packages/SystemUI/src/com/android/keyguard/CarrierText.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/CarrierText.java
rename to packages/SystemUI/src/com/android/keyguard/CarrierText.java
diff --git a/packages/Keyguard/src/com/android/keyguard/EmergencyButton.java b/packages/SystemUI/src/com/android/keyguard/EmergencyButton.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/EmergencyButton.java
rename to packages/SystemUI/src/com/android/keyguard/EmergencyButton.java
diff --git a/packages/Keyguard/src/com/android/keyguard/EmergencyCarrierArea.java b/packages/SystemUI/src/com/android/keyguard/EmergencyCarrierArea.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/EmergencyCarrierArea.java
rename to packages/SystemUI/src/com/android/keyguard/EmergencyCarrierArea.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardConstants.java b/packages/SystemUI/src/com/android/keyguard/KeyguardConstants.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardConstants.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardConstants.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardDisplayManager.java b/packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardDisplayManager.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardHostView.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardHostView.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardMessageArea.java b/packages/SystemUI/src/com/android/keyguard/KeyguardMessageArea.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardMessageArea.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardMessageArea.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardPINView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardPINView.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardPinBasedInputView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardPinBasedInputView.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityCallback.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityCallback.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardSecurityCallback.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardSecurityCallback.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityModel.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityModel.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardSecurityModel.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardSecurityModel.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityView.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardSecurityView.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardSecurityView.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityViewFlipper.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityViewFlipper.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardSecurityViewFlipper.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardSecurityViewFlipper.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSimPinView.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardSimPinView.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSimPukView.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardSimPukView.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java
diff --git a/packages/Keyguard/src/com/android/keyguard/LatencyTracker.java b/packages/SystemUI/src/com/android/keyguard/LatencyTracker.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/LatencyTracker.java
rename to packages/SystemUI/src/com/android/keyguard/LatencyTracker.java
diff --git a/packages/Keyguard/src/com/android/keyguard/LiftToActivateListener.java b/packages/SystemUI/src/com/android/keyguard/LiftToActivateListener.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/LiftToActivateListener.java
rename to packages/SystemUI/src/com/android/keyguard/LiftToActivateListener.java
diff --git a/packages/Keyguard/src/com/android/keyguard/NumPadKey.java b/packages/SystemUI/src/com/android/keyguard/NumPadKey.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/NumPadKey.java
rename to packages/SystemUI/src/com/android/keyguard/NumPadKey.java
diff --git a/packages/Keyguard/src/com/android/keyguard/ObscureSpeechDelegate.java b/packages/SystemUI/src/com/android/keyguard/ObscureSpeechDelegate.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/ObscureSpeechDelegate.java
rename to packages/SystemUI/src/com/android/keyguard/ObscureSpeechDelegate.java
diff --git a/packages/Keyguard/src/com/android/keyguard/PasswordTextView.java b/packages/SystemUI/src/com/android/keyguard/PasswordTextView.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/PasswordTextView.java
rename to packages/SystemUI/src/com/android/keyguard/PasswordTextView.java
diff --git a/packages/Keyguard/src/com/android/keyguard/SecurityMessageDisplay.java b/packages/SystemUI/src/com/android/keyguard/SecurityMessageDisplay.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/SecurityMessageDisplay.java
rename to packages/SystemUI/src/com/android/keyguard/SecurityMessageDisplay.java
diff --git a/packages/Keyguard/src/com/android/keyguard/ViewMediatorCallback.java b/packages/SystemUI/src/com/android/keyguard/ViewMediatorCallback.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/ViewMediatorCallback.java
rename to packages/SystemUI/src/com/android/keyguard/ViewMediatorCallback.java
diff --git a/packages/Keyguard/src/com/android/systemui/EventLogTags.logtags b/packages/SystemUI/src/com/android/systemui/EventLogTags.logtags
similarity index 100%
rename from packages/Keyguard/src/com/android/systemui/EventLogTags.logtags
rename to packages/SystemUI/src/com/android/systemui/EventLogTags.logtags
diff --git a/packages/SystemUI/tests/Android.mk b/packages/SystemUI/tests/Android.mk
index cefade0..8f5df7b 100644
--- a/packages/SystemUI/tests/Android.mk
+++ b/packages/SystemUI/tests/Android.mk
@@ -32,10 +32,10 @@
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res \
frameworks/base/packages/SystemUI/res \
+ frameworks/base/packages/SystemUI/res-keyguard \
LOCAL_STATIC_ANDROID_LIBRARIES := \
SystemUIPluginLib \
- Keyguard \
android-support-v7-recyclerview \
android-support-v7-preference \
android-support-v7-appcompat \
@@ -52,7 +52,7 @@
LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common android.car
-LOCAL_AAPT_FLAGS := --extra-packages com.android.systemui
+LOCAL_AAPT_FLAGS := --extra-packages com.android.systemui:com.android.keyguard
# sign this with platform cert, so this test is allowed to inject key events into
# UI it doesn't own. This is necessary to allow screenshots to be taken
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java
index e8eee24..a208013 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java
@@ -42,7 +42,9 @@
import org.junit.runner.RunWith;
@SmallTest
-@RunWith(AndroidJUnit4.class)
+// @RunWith(AndroidJUnit4.class)
+// TODO(gpitsch): We have seen some flakes in these tests, needs some investigation.
+// Q: How is mMetricsReader being used by the tested code?
public class StatusBarTest extends SysuiTestCase {
StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;
@@ -54,7 +56,7 @@
private MetricsReader mMetricsReader;
private DisplayMetrics mDisplayMetrics = new DisplayMetrics();
- @Before
+ // @Before
public void setup() {
mStatusBarKeyguardViewManager = mock(StatusBarKeyguardViewManager.class);
mUnlockMethodCache = mock(UnlockMethodCache.class);
@@ -87,7 +89,7 @@
}
}
- @Test
+ // @Test
public void executeRunnableDismissingKeyguard_nullRunnable_showingAndOccluded() {
when(mStatusBarKeyguardViewManager.isShowing()).thenReturn(true);
when(mStatusBarKeyguardViewManager.isOccluded()).thenReturn(true);
@@ -95,7 +97,7 @@
mStatusBar.executeRunnableDismissingKeyguard(null, null, false, false, false);
}
- @Test
+ // @Test
public void executeRunnableDismissingKeyguard_nullRunnable_showing() {
when(mStatusBarKeyguardViewManager.isShowing()).thenReturn(true);
when(mStatusBarKeyguardViewManager.isOccluded()).thenReturn(false);
@@ -103,7 +105,7 @@
mStatusBar.executeRunnableDismissingKeyguard(null, null, false, false, false);
}
- @Test
+ // @Test
public void executeRunnableDismissingKeyguard_nullRunnable_notShowing() {
when(mStatusBarKeyguardViewManager.isShowing()).thenReturn(false);
when(mStatusBarKeyguardViewManager.isOccluded()).thenReturn(false);
@@ -111,7 +113,7 @@
mStatusBar.executeRunnableDismissingKeyguard(null, null, false, false, false);
}
- @Test
+ // @Test
public void lockscreenStateMetrics_notShowing() {
// uninteresting state, except that fingerprint must be non-zero
when(mStatusBarKeyguardViewManager.isOccluded()).thenReturn(false);
@@ -129,7 +131,7 @@
.setSubtype(0));
}
- @Test
+ // @Test
public void lockscreenStateMetrics_notShowing_secure() {
// uninteresting state, except that fingerprint must be non-zero
when(mStatusBarKeyguardViewManager.isOccluded()).thenReturn(false);
@@ -147,7 +149,7 @@
.setSubtype(1));
}
- @Test
+ // @Test
public void lockscreenStateMetrics_isShowing() {
// uninteresting state, except that fingerprint must be non-zero
when(mStatusBarKeyguardViewManager.isOccluded()).thenReturn(false);
@@ -165,7 +167,7 @@
.setSubtype(0));
}
- @Test
+ // @Test
public void lockscreenStateMetrics_isShowing_secure() {
// uninteresting state, except that fingerprint must be non-zero
when(mStatusBarKeyguardViewManager.isOccluded()).thenReturn(false);
@@ -183,7 +185,7 @@
.setSubtype(1));
}
- @Test
+ // @Test
public void lockscreenStateMetrics_isShowingBouncer() {
// uninteresting state, except that fingerprint must be non-zero
when(mStatusBarKeyguardViewManager.isOccluded()).thenReturn(false);
@@ -201,7 +203,7 @@
.setSubtype(1));
}
- @Test
+ // @Test
public void onActivatedMetrics() {
ActivatableNotificationView view = mock(ActivatableNotificationView.class);
mStatusBar.onActivated(view);
@@ -226,4 +228,4 @@
return null;
}
}
-}
\ No newline at end of file
+}
diff --git a/services/autofill/java/com/android/server/autofill/AutoFillManagerService.java b/services/autofill/java/com/android/server/autofill/AutoFillManagerService.java
index 631fb53..c16a51c 100644
--- a/services/autofill/java/com/android/server/autofill/AutoFillManagerService.java
+++ b/services/autofill/java/com/android/server/autofill/AutoFillManagerService.java
@@ -34,6 +34,7 @@
import android.graphics.Rect;
import android.net.Uri;
import android.os.Binder;
+import android.os.Bundle;
import android.os.Handler;
import android.os.IBinder;
import android.os.Looper;
@@ -54,12 +55,14 @@
import com.android.internal.annotations.GuardedBy;
import com.android.internal.os.BackgroundThread;
import com.android.internal.os.HandlerCaller;
+import com.android.internal.os.IResultReceiver;
import com.android.internal.os.SomeArgs;
import com.android.server.LocalServices;
import com.android.server.SystemService;
import java.io.FileDescriptor;
import java.io.PrintWriter;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -77,6 +80,10 @@
private static final int MSG_UPDATE_SESSION = 2;
private static final int MSG_FINISH_SESSION = 3;
private static final int MSG_REQUEST_SAVE_FOR_USER = 4;
+ private static final int MSG_LIST_SESSIONS = 5;
+ private static final int MSG_RESET = 6;
+
+ static final String RECEIVER_BUNDLE_EXTRA_SESSIONS = "sessions";
private final Context mContext;
private final AutoFillUI mUi;
@@ -111,6 +118,12 @@
final int flags = args.argi6;
handleUpdateSession(userId, activityToken, autoFillId, bounds, value, flags);
return;
+ } case MSG_LIST_SESSIONS: {
+ handleListForUser(msg.arg1, (IResultReceiver) msg.obj);
+ return;
+ } case MSG_RESET: {
+ handleReset();
+ return;
} default: {
Slog.w(TAG, "Invalid message: " + msg);
}
@@ -203,12 +216,29 @@
return service;
}
+ // Called by Shell command.
void requestSaveForUser(int userId) {
+ Slog.i(TAG, "requestSaveForUser(): " + userId);
mContext.enforceCallingPermission(MANAGE_AUTO_FILL, TAG);
mHandlerCaller.sendMessage(mHandlerCaller.obtainMessageI(
MSG_REQUEST_SAVE_FOR_USER, userId));
}
+ // Called by Shell command.
+ void listSessions(int userId, IResultReceiver receiver) {
+ Slog.i(TAG, "listSessions() for userId " + userId);
+ mContext.enforceCallingPermission(MANAGE_AUTO_FILL, TAG);
+ mHandlerCaller.sendMessage(
+ mHandlerCaller.obtainMessageIO(MSG_LIST_SESSIONS, userId, receiver));
+ }
+
+ // Called by Shell command.
+ void reset() {
+ Slog.i(TAG, "reset()");
+ mContext.enforceCallingPermission(MANAGE_AUTO_FILL, TAG);
+ mHandlerCaller.sendMessage(mHandlerCaller.obtainMessage(MSG_RESET));
+ }
+
/**
* Removes a cached service for a given user.
*/
@@ -279,6 +309,39 @@
}
}
+ private void handleListForUser(int userId, IResultReceiver receiver) {
+ final Bundle resultData = new Bundle();
+ final ArrayList<String> sessions = new ArrayList<>();
+
+ synchronized (mLock) {
+ if (userId != UserHandle.USER_ALL) {
+ mServicesCache.get(userId).listSessionsLocked(sessions);
+ } else {
+ final int size = mServicesCache.size();
+ for (int i = 0; i < size; i++) {
+ mServicesCache.valueAt(i).listSessionsLocked(sessions);
+ }
+ }
+ }
+
+ resultData.putStringArrayList(RECEIVER_BUNDLE_EXTRA_SESSIONS, sessions);
+ try {
+ receiver.send(0, resultData);
+ } catch (RemoteException e) {
+ // Just ignore it...
+ }
+ }
+
+ private void handleReset() {
+ synchronized (mLock) {
+ final int size = mServicesCache.size();
+ for (int i = 0; i < size; i++) {
+ mServicesCache.valueAt(i).destroyLocked();
+ }
+ mServicesCache.clear();
+ }
+ }
+
final class AutoFillManagerServiceStub extends IAutoFillManagerService.Stub {
@Override
diff --git a/services/autofill/java/com/android/server/autofill/AutoFillManagerServiceImpl.java b/services/autofill/java/com/android/server/autofill/AutoFillManagerServiceImpl.java
index 9e0b31a..2891518 100644
--- a/services/autofill/java/com/android/server/autofill/AutoFillManagerServiceImpl.java
+++ b/services/autofill/java/com/android/server/autofill/AutoFillManagerServiceImpl.java
@@ -70,6 +70,7 @@
import com.android.server.FgThread;
import java.io.PrintWriter;
+import java.util.ArrayList;
import java.util.Map;
import java.util.Map.Entry;
@@ -330,6 +331,12 @@
}
}
+ void listSessionsLocked(ArrayList<String> output) {
+ for (IBinder activityToken : mSessions.keySet()) {
+ output.add(mComponentName + ":" + activityToken);
+ }
+ }
+
@Override
public String toString() {
return "AutoFillManagerServiceImpl: [userId=" + mUserId
diff --git a/services/autofill/java/com/android/server/autofill/AutoFillManagerServiceShellCommand.java b/services/autofill/java/com/android/server/autofill/AutoFillManagerServiceShellCommand.java
index 3318b2b..cfa4a1d 100644
--- a/services/autofill/java/com/android/server/autofill/AutoFillManagerServiceShellCommand.java
+++ b/services/autofill/java/com/android/server/autofill/AutoFillManagerServiceShellCommand.java
@@ -16,12 +16,20 @@
package com.android.server.autofill;
+import static com.android.server.autofill.AutoFillManagerService.RECEIVER_BUNDLE_EXTRA_SESSIONS;
+
import android.app.ActivityManager;
+import android.os.Bundle;
import android.os.RemoteException;
import android.os.ShellCommand;
import android.os.UserHandle;
+import com.android.internal.os.IResultReceiver;
+
import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
public final class AutoFillManagerServiceShellCommand extends ShellCommand {
@@ -37,17 +45,16 @@
return handleDefaultCommands(cmd);
}
final PrintWriter pw = getOutPrintWriter();
- try {
- switch (cmd) {
- case "save":
- return requestSave();
- default:
- return handleDefaultCommands(cmd);
- }
- } catch (RemoteException e) {
- pw.println("error: " + e);
+ switch (cmd) {
+ case "save":
+ return requestSave();
+ case "list":
+ return requestList(pw);
+ case "reset":
+ return requestReset();
+ default:
+ return handleDefaultCommands(cmd);
}
- return -1;
}
@Override
@@ -57,22 +64,79 @@
pw.println(" help");
pw.println(" Prints this help text.");
pw.println("");
+ pw.println(" list sessions [--user USER_ID]");
+ pw.println(" List all pending sessions.");
+ pw.println("");
pw.println(" save [--user USER_ID]");
pw.println(" Request provider to save contents of the top activity. ");
pw.println("");
+ pw.println(" reset");
+ pw.println(" Reset all pending sessions and cached service connections.");
+ pw.println("");
}
}
- private int requestSave() throws RemoteException {
- final int userId = getUserIdFromArgs();
+ private int requestSave() {
+ final int userId = getUserIdFromArgsOrCurrentUser();
mService.requestSaveForUser(userId);
return 0;
}
- private int getUserIdFromArgs() {
+ private int requestList(PrintWriter pw) {
+ final String type = getNextArgRequired();
+ if (!type.equals("sessions")) {
+ pw.println("Error: invalid list type");
+ return -1;
+
+ }
+ final int userId = getUserIdFromArgsOrAllUsers();
+ final CountDownLatch latch = new CountDownLatch(1);
+ final IResultReceiver receiver = new IResultReceiver.Stub() {
+
+ @Override
+ public void send(int resultCode, Bundle resultData) throws RemoteException {
+ final ArrayList<String> sessions = resultData
+ .getStringArrayList(RECEIVER_BUNDLE_EXTRA_SESSIONS);
+
+ for (String session : sessions) {
+ pw.println(session);
+ }
+ latch.countDown();
+ }
+ };
+
+ mService.listSessions(userId, receiver);
+
+ try {
+ final boolean received = latch.await(5, TimeUnit.SECONDS);
+ if (!received) {
+ pw.println("Timed out after 5 seconds");
+ return -1;
+ }
+ } catch (InterruptedException e) {
+ pw.println("System call interrupted");
+ Thread.currentThread().interrupt();
+ return -1;
+ }
+ return 0;
+ }
+
+ private int requestReset() {
+ mService.reset();
+ return 0;
+ }
+
+ private int getUserIdFromArgsOrCurrentUser() {
if ("--user".equals(getNextArg())) {
return UserHandle.parseUserArg(getNextArgRequired());
}
return ActivityManager.getCurrentUser();
}
+
+ private int getUserIdFromArgsOrAllUsers() {
+ if ("--user".equals(getNextArg())) {
+ return UserHandle.parseUserArg(getNextArgRequired());
+ }
+ return UserHandle.USER_ALL;
+ }
}
diff --git a/services/core/java/com/android/server/DeviceIdleController.java b/services/core/java/com/android/server/DeviceIdleController.java
index 97edb15..44ca6a9 100644
--- a/services/core/java/com/android/server/DeviceIdleController.java
+++ b/services/core/java/com/android/server/DeviceIdleController.java
@@ -1252,11 +1252,20 @@
}
public class LocalService {
+ // duration in milliseconds
+ public void addPowerSaveTempWhitelistApp(int callingUid, String packageName,
+ long duration, int userId, boolean sync, String reason) {
+ addPowerSaveTempWhitelistAppInternal(callingUid, packageName, duration,
+ userId, sync, reason);
+ }
+
+ // duration in milliseconds
public void addPowerSaveTempWhitelistAppDirect(int appId, long duration, boolean sync,
String reason) {
addPowerSaveTempWhitelistAppDirectInternal(0, appId, duration, sync, reason);
}
+ // duration in milliseconds
public long getNotificationWhitelistDuration() {
return mConstants.NOTIFICATION_WHITELIST_DURATION;
}
diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java
index f0f50f0..2b3d8d4 100644
--- a/services/core/java/com/android/server/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/InputMethodManagerService.java
@@ -227,6 +227,12 @@
new LruCache<>(SECURE_SUGGESTION_SPANS_MAX_SIZE);
private final InputMethodSubtypeSwitchingController mSwitchingController;
+ /**
+ * Tracks how many times {@link #mMethodMap} was updated.
+ */
+ @GuardedBy("mMethodMap")
+ private int mMethodMapUpdateCount = 0;
+
// Used to bring IME service up to visible adjustment while it is being shown.
final ServiceConnection mVisibleConnection = new ServiceConnection() {
@Override public void onServiceConnected(ComponentName name, IBinder service) {
@@ -594,15 +600,35 @@
restoreEnabledInputMethods(mContext, prevValue, newValue);
}
} else if (Intent.ACTION_LOCALE_CHANGED.equals(action)) {
- synchronized (mMethodMap) {
- resetStateIfCurrentLocaleChangedLocked();
- }
+ onActionLocaleChanged();
} else {
Slog.w(TAG, "Unexpected intent " + intent);
}
}
}
+ /**
+ * Handles {@link Intent#ACTION_LOCALE_CHANGED}.
+ *
+ * <p>Note: For historical reasons, {@link Intent#ACTION_LOCALE_CHANGED} has been sent to all
+ * the users. We should ignore this event if this is about any background user's locale.</p>
+ *
+ * <p>Caution: This method must not be called when system is not ready.</p>
+ */
+ void onActionLocaleChanged() {
+ synchronized (mMethodMap) {
+ final LocaleList possibleNewLocale = mRes.getConfiguration().getLocales();
+ if (possibleNewLocale != null && possibleNewLocale.equals(mLastSystemLocales)) {
+ return;
+ }
+ buildInputMethodListLocked(true);
+ // If the locale is changed, needs to reset the default ime
+ resetDefaultImeLocked(mContext);
+ updateFromSettingsLocked(true);
+ mLastSystemLocales = possibleNewLocale;
+ }
+ }
+
// Apply the results of a restore operation to the set of enabled IMEs. Note that this
// does not attempt to validate on the fly with any installed device policy, so must only
// be run in the context of initial device setup.
@@ -974,51 +1000,6 @@
setSelectedInputMethodAndSubtypeLocked(defIm, NOT_A_SUBTYPE_ID, false);
}
- private void resetAllInternalStateLocked(final boolean updateOnlyWhenLocaleChanged,
- final boolean resetDefaultEnabledIme) {
- if (!mSystemReady) {
- // not system ready
- return;
- }
- final LocaleList newLocales = mRes.getConfiguration().getLocales();
- if (!updateOnlyWhenLocaleChanged
- || (newLocales != null && !newLocales.equals(mLastSystemLocales))) {
- if (!updateOnlyWhenLocaleChanged) {
- hideCurrentInputLocked(0, null);
- resetCurrentMethodAndClient(InputMethodClient.UNBIND_REASON_RESET_IME);
- }
- if (DEBUG) {
- Slog.i(TAG, "LocaleList has been changed to " + newLocales);
- }
- buildInputMethodListLocked(resetDefaultEnabledIme);
- if (!updateOnlyWhenLocaleChanged) {
- final String selectedImiId = mSettings.getSelectedInputMethod();
- if (TextUtils.isEmpty(selectedImiId)) {
- // This is the first time of the user switch and
- // set the current ime to the proper one.
- resetDefaultImeLocked(mContext);
- }
- } else {
- // If the locale is changed, needs to reset the default ime
- resetDefaultImeLocked(mContext);
- }
- updateFromSettingsLocked(true);
- mLastSystemLocales = newLocales;
- if (!updateOnlyWhenLocaleChanged) {
- try {
- startInputInnerLocked();
- } catch (RuntimeException e) {
- Slog.w(TAG, "Unexpected exception", e);
- }
- }
- }
- }
-
- private void resetStateIfCurrentLocaleChangedLocked() {
- resetAllInternalStateLocked(true /* updateOnlyWhenLocaleChanged */,
- true /* resetDefaultImeLocked */);
- }
-
private void switchUserLocked(int newUserId) {
if (DEBUG) Slog.d(TAG, "Switching user stage 1/3. newUserId=" + newUserId
+ " currentUserId=" + mSettings.getCurrentUserId());
@@ -1045,8 +1026,26 @@
// Even in such cases, IMMS works fine because it will find the most applicable
// IME for that user.
final boolean initialUserSwitch = TextUtils.isEmpty(defaultImiId);
- resetAllInternalStateLocked(false /* updateOnlyWhenLocaleChanged */,
- initialUserSwitch /* needsToResetDefaultIme */);
+ mLastSystemLocales = mRes.getConfiguration().getLocales();
+
+ // TODO: Is it really possible that switchUserLocked() happens before system ready?
+ if (mSystemReady) {
+ hideCurrentInputLocked(0, null);
+ resetCurrentMethodAndClient(InputMethodClient.UNBIND_REASON_SWITCH_USER);
+ buildInputMethodListLocked(initialUserSwitch);
+ if (TextUtils.isEmpty(mSettings.getSelectedInputMethod())) {
+ // This is the first time of the user switch and
+ // set the current ime to the proper one.
+ resetDefaultImeLocked(mContext);
+ }
+ updateFromSettingsLocked(true);
+ try {
+ startInputInnerLocked();
+ } catch (RuntimeException e) {
+ Slog.w(TAG, "Unexpected exception", e);
+ }
+ }
+
if (initialUserSwitch) {
InputMethodUtils.setNonSelectedSystemImesDisabledUntilUsed(mIPackageManager,
mSettings.getEnabledInputMethodListLocked(), newUserId,
@@ -3069,6 +3068,7 @@
}
mMethodList.clear();
mMethodMap.clear();
+ mMethodMapUpdateCount++;
mMyPackageMonitor.clearPackagesToMonitorComponentChangeLocked();
// Use for queryIntentServicesAsUser
@@ -4070,7 +4070,7 @@
synchronized (mMethodMap) {
p.println("Current Input Method Manager state:");
int N = mMethodList.size();
- p.println(" Input Methods:");
+ p.println(" Input Methods: mMethodMapUpdateCount=" + mMethodMapUpdateCount);
for (int i=0; i<N; i++) {
InputMethodInfo info = mMethodList.get(i);
p.println(" InputMethod #" + i + ":");
diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java
index 793a163..2bc131f 100644
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -462,7 +462,7 @@
ComponentName cmp = startServiceInnerLocked(smap, service, r, callerFg, addToStarting);
if (notification != null) {
- setServiceForegroundInnerLocked(r, callingUid, notification, 0);
+ setServiceForegroundInnerLocked(r, id, notification, 0);
}
return cmp;
}
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 69a3a26..3b9426d 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -2328,7 +2328,8 @@
}
}
vrService.setVrMode(vrMode, requestedPackage, userId, callingPackage);
- } case NOTIFY_VR_SLEEPING_MSG: {
+ } break;
+ case NOTIFY_VR_SLEEPING_MSG: {
notifyVrManagerOfSleepState(msg.arg1 != 0);
} break;
case HANDLE_TRUST_STORAGE_UPDATE_MSG: {
@@ -9916,7 +9917,7 @@
try {
if (DEBUG_STACK) Slog.d(TAG_STACK, "moveStackToDisplay: moving stackId=" + stackId
+ " to displayId=" + displayId);
- mStackSupervisor.moveStackToDisplayLocked(stackId, displayId);
+ mStackSupervisor.moveStackToDisplayLocked(stackId, displayId, ON_TOP);
} finally {
Binder.restoreCallingIdentity(ident);
}
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index 104fc6a..cf0ebaf 100644
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -477,6 +477,8 @@
mTmpRect2.setEmpty();
mWindowContainerController.reparent(activityDisplay.mDisplayId, mTmpRect2);
postAddToDisplay(activityDisplay, mTmpRect2.isEmpty() ? null : mTmpRect2, onTop);
+ adjustFocusToNextFocusableStackLocked("reparent", true /* allowFocusSelf */);
+ mStackSupervisor.resumeFocusedStackTopActivityLocked();
}
/**
@@ -3179,8 +3181,18 @@
mStackSupervisor.topRunningActivityLocked(), myReason);
}
+ /** Find next proper focusable stack and make it focused. */
private boolean adjustFocusToNextFocusableStackLocked(String reason) {
- final ActivityStack stack = mStackSupervisor.getNextFocusableStackLocked(this);
+ return adjustFocusToNextFocusableStackLocked(reason, false /* allowFocusSelf */);
+ }
+
+ /**
+ * Find next proper focusable stack and make it focused.
+ * @param allowFocusSelf Is the focus allowed to remain on the same stack.
+ */
+ private boolean adjustFocusToNextFocusableStackLocked(String reason, boolean allowFocusSelf) {
+ final ActivityStack stack = mStackSupervisor.getNextFocusableStackLocked(
+ allowFocusSelf ? null : this);
final String myReason = reason + " adjustFocusToNextFocusableStack";
if (stack == null) {
return false;
@@ -3190,7 +3202,8 @@
if (stack.isHomeOrRecentsStack() && (top == null || !top.visible)) {
// If we will be focusing on the home stack next and its current top activity isn't
- // visible, then use the task return to value to determine the home task to display next.
+ // visible, then use the task return to value to determine the home task to display
+ // next.
return mStackSupervisor.moveHomeStackTaskToTop(reason);
}
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index e954363..95734a4 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -40,6 +40,7 @@
import static android.view.Display.DEFAULT_DISPLAY;
import static android.view.Display.FLAG_PRIVATE;
import static android.view.Display.INVALID_DISPLAY;
+import static android.view.Display.REMOVE_MODE_DESTROY_CONTENT;
import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_ALL;
import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_CONTAINERS;
@@ -2616,8 +2617,9 @@
* Move stack with all its existing content to specified display.
* @param stackId Id of stack to move.
* @param displayId Id of display to move stack to.
+ * @param onTop Indicates whether container should be place on top or on bottom.
*/
- void moveStackToDisplayLocked(int stackId, int displayId) {
+ void moveStackToDisplayLocked(int stackId, int displayId, boolean onTop) {
final ActivityDisplay activityDisplay = mActivityDisplays.get(displayId);
if (activityDisplay == null) {
throw new IllegalArgumentException("moveStackToDisplayLocked: Unknown displayId="
@@ -2631,7 +2633,7 @@
+ " to its current displayId=" + displayId);
}
- activityContainer.moveToDisplayLocked(activityDisplay);
+ activityContainer.moveToDisplayLocked(activityDisplay, onTop);
} else {
throw new IllegalStateException("moveStackToDisplayLocked: Stack with stackId="
+ stackId + " is not attached to any display.");
@@ -3777,12 +3779,16 @@
synchronized (mService) {
ActivityDisplay activityDisplay = mActivityDisplays.get(displayId);
if (activityDisplay != null) {
+ final boolean destroyContentOnRemoval
+ = activityDisplay.shouldDestroyContentOnRemove();
ArrayList<ActivityStack> stacks = activityDisplay.mStacks;
for (int stackNdx = stacks.size() - 1; stackNdx >= 0; --stackNdx) {
final ActivityStack stack = stacks.get(stackNdx);
- // TODO: Implement proper stack removal and ability to choose the behavior -
- // remove stack completely or move it to other display.
- moveStackToDisplayLocked(stack.mStackId, DEFAULT_DISPLAY);
+ moveStackToDisplayLocked(stack.mStackId, DEFAULT_DISPLAY,
+ !destroyContentOnRemoval /* onTop */);
+ if (destroyContentOnRemoval) {
+ stack.finishAllActivitiesLocked(true /* immediately */);
+ }
}
mActivityDisplays.remove(displayId);
}
@@ -4451,8 +4457,9 @@
/**
* Move the stack to specified display.
* @param activityDisplay Target display to move the stack to.
+ * @param onTop Indicates whether container should be place on top or on bottom.
*/
- void moveToDisplayLocked(ActivityDisplay activityDisplay) {
+ void moveToDisplayLocked(ActivityDisplay activityDisplay, boolean onTop) {
if (DEBUG_STACK) Slog.d(TAG_STACK, "moveToDisplayLocked: " + this + " from display="
+ mActivityDisplay + " to display=" + activityDisplay
+ " Callers=" + Debug.getCallers(2));
@@ -4460,7 +4467,7 @@
removeFromDisplayLocked();
mActivityDisplay = activityDisplay;
- mStack.reparent(activityDisplay, ON_TOP);
+ mStack.reparent(activityDisplay, onTop);
}
@Override
@@ -4642,8 +4649,6 @@
/** Actual Display this object tracks. */
int mDisplayId;
Display mDisplay;
- private final DisplayMetrics mRealMetrics = new DisplayMetrics();
- private final Point mRealSize = new Point();
/** All of the stacks on this display. Order matters, topmost stack is in front of all other
* stacks, bottommost behind. Accessed directly by ActivityManager package classes */
@@ -4737,6 +4742,10 @@
}
return mDisplayAccessUIDs;
}
+
+ boolean shouldDestroyContentOnRemove() {
+ return mDisplay.getRemoveMode() == REMOVE_MODE_DESTROY_CONTENT;
+ }
}
class VirtualActivityDisplay extends ActivityDisplay {
diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java
index a5876dd..b963555 100644
--- a/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -85,6 +85,8 @@
import com.android.internal.net.VpnConfig;
import com.android.internal.net.VpnInfo;
import com.android.internal.net.VpnProfile;
+import com.android.server.DeviceIdleController;
+import com.android.server.LocalServices;
import com.android.server.net.BaseNetworkObserver;
import libcore.io.IoUtils;
@@ -115,6 +117,10 @@
private static final String TAG = "Vpn";
private static final boolean LOGD = true;
+ // Length of time (in milliseconds) that an app hosting an always-on VPN is placed on
+ // the device idle whitelist during service launch and VPN bootstrap.
+ private static final long VPN_LAUNCH_IDLE_WHITELIST_DURATION = 60 * 1000;
+
// TODO: create separate trackers for each unique VPN to support
// automated reconnection
@@ -389,14 +395,26 @@
}
}
- // Start the VPN service declared in the app's manifest.
- Intent serviceIntent = new Intent(VpnConfig.SERVICE_INTERFACE);
- serviceIntent.setPackage(alwaysOnPackage);
+ // Tell the OS that background services in this app need to be allowed for
+ // a short time, so we can bootstrap the VPN service.
+ final long oldId = Binder.clearCallingIdentity();
try {
- return mContext.startServiceAsUser(serviceIntent, UserHandle.of(mUserHandle)) != null;
- } catch (RuntimeException e) {
- Log.e(TAG, "VpnService " + serviceIntent + " failed to start", e);
- return false;
+ DeviceIdleController.LocalService idleController =
+ LocalServices.getService(DeviceIdleController.LocalService.class);
+ idleController.addPowerSaveTempWhitelistApp(Process.myUid(), alwaysOnPackage,
+ VPN_LAUNCH_IDLE_WHITELIST_DURATION, mUserHandle, false, "vpn");
+
+ // Start the VPN service declared in the app's manifest.
+ Intent serviceIntent = new Intent(VpnConfig.SERVICE_INTERFACE);
+ serviceIntent.setPackage(alwaysOnPackage);
+ try {
+ return mContext.startServiceAsUser(serviceIntent, UserHandle.of(mUserHandle)) != null;
+ } catch (RuntimeException e) {
+ Log.e(TAG, "VpnService " + serviceIntent + " failed to start", e);
+ return false;
+ }
+ } finally {
+ Binder.restoreCallingIdentity(oldId);
}
}
diff --git a/services/core/java/com/android/server/display/LogicalDisplay.java b/services/core/java/com/android/server/display/LogicalDisplay.java
index 40a8952..a947b41 100644
--- a/services/core/java/com/android/server/display/LogicalDisplay.java
+++ b/services/core/java/com/android/server/display/LogicalDisplay.java
@@ -216,6 +216,8 @@
}
if ((deviceInfo.flags & DisplayDeviceInfo.FLAG_PRIVATE) != 0) {
mBaseDisplayInfo.flags |= Display.FLAG_PRIVATE;
+ // For private displays by default content is destroyed on removal.
+ mBaseDisplayInfo.removeMode = Display.REMOVE_MODE_DESTROY_CONTENT;
}
if ((deviceInfo.flags & DisplayDeviceInfo.FLAG_PRESENTATION) != 0) {
mBaseDisplayInfo.flags |= Display.FLAG_PRESENTATION;
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 4207998..8345491 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -836,6 +836,8 @@
private File mCacheDir;
+ private ArraySet<String> mPrivappPermissionsViolations;
+
private static class IFVerificationParams {
PackageParser.Package pkg;
boolean replacing;
@@ -11543,6 +11545,12 @@
if (!whitelisted) {
Slog.w(TAG, "Privileged permission " + perm + " for package "
+ pkg.packageName + " - not in privapp-permissions whitelist");
+ if (!mSystemReady) {
+ if (mPrivappPermissionsViolations == null) {
+ mPrivappPermissionsViolations = new ArraySet<>();
+ }
+ mPrivappPermissionsViolations.add(pkg.packageName + ": " + perm);
+ }
if (RoSystemProperties.CONTROL_PRIVAPP_PERMISSIONS_ENFORCE) {
return false;
}
@@ -19972,6 +19980,12 @@
// Now that we're mostly running, clean up stale users and apps
sUserManager.reconcileUsers(StorageManager.UUID_PRIVATE_INTERNAL);
reconcileApps(StorageManager.UUID_PRIVATE_INTERNAL);
+
+ if (mPrivappPermissionsViolations != null) {
+ Slog.wtf(TAG,"Signature|privileged permissions not in "
+ + "privapp-permissions whitelist: " + mPrivappPermissionsViolations);
+ mPrivappPermissionsViolations = null;
+ }
}
@Override
diff --git a/tools/bit/main.cpp b/tools/bit/main.cpp
index 868d90a1..d056ba5 100644
--- a/tools/bit/main.cpp
+++ b/tools/bit/main.cpp
@@ -455,6 +455,7 @@
fprintf(stderr, "Test / activity supplied without a module to build: %s\n",
arg.c_str());
print_usage(stderr);
+ delete target;
exit(1);
} else if (colonPos == string::npos) {
target->name = arg;
diff --git a/wifi/java/android/net/wifi/WifiNetworkScoreCache.java b/wifi/java/android/net/wifi/WifiNetworkScoreCache.java
index 04dea1b..f61dfdc 100755
--- a/wifi/java/android/net/wifi/WifiNetworkScoreCache.java
+++ b/wifi/java/android/net/wifi/WifiNetworkScoreCache.java
@@ -145,7 +145,7 @@
if (network != null && network.rssiCurve != null) {
score = network.rssiCurve.lookupScore(result.level);
if (DBG) {
- Log.e(TAG, "getNetworkScore found scored network " + network.networkKey
+ Log.d(TAG, "getNetworkScore found scored network " + network.networkKey
+ " score " + Integer.toString(score)
+ " RSSI " + result.level);
}
@@ -171,7 +171,7 @@
if (network != null && network.rssiCurve != null) {
score = network.rssiCurve.lookupScore(result.level, isActiveNetwork);
if (DBG) {
- Log.e(TAG, "getNetworkScore found scored network " + network.networkKey
+ Log.d(TAG, "getNetworkScore found scored network " + network.networkKey
+ " score " + Integer.toString(score)
+ " RSSI " + result.level
+ " isActiveNetwork " + isActiveNetwork);
