OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Free allocated varargs" into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 19:08:26 +0000 (19:08 +0000)]
Merge "Free allocated varargs" into pi-dev

6 years agoMerge "Change allowed sound triggers to 1000" into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 18:45:22 +0000 (18:45 +0000)]
Merge "Change allowed sound triggers to 1000" into pi-dev

6 years agoMerge "Don't start Window enter animation as a result of AWT becoming visible." into...
Chavi Weingarten [Tue, 17 Apr 2018 18:16:46 +0000 (18:16 +0000)]
Merge "Don't start Window enter animation as a result of AWT becoming visible." into pi-dev

6 years agoMerge "Checks that secondary instrumentation ABI matches" into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 18:16:18 +0000 (18:16 +0000)]
Merge "Checks that secondary instrumentation ABI matches" into pi-dev

6 years agoMerge "Make VR brightness adjustable again." into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 18:11:29 +0000 (18:11 +0000)]
Merge "Make VR brightness adjustable again." into pi-dev

6 years agoFree allocated varargs
Yi Jin [Fri, 6 Apr 2018 22:37:36 +0000 (15:37 -0700)]
Free allocated varargs

Bug: 78173836
Test: atest incidentd_test
Change-Id: I1e1b9f63d0e863c733c51efef432235eb94cdbab

6 years agoMerge "String update for effect suppressors" into pi-dev
Julia Reynolds [Tue, 17 Apr 2018 17:37:06 +0000 (17:37 +0000)]
Merge "String update for effect suppressors" into pi-dev

6 years agoMerge "Set accessibility action label for smart replies." into pi-dev
Milo Sredkov [Tue, 17 Apr 2018 17:18:28 +0000 (17:18 +0000)]
Merge "Set accessibility action label for smart replies." into pi-dev

6 years agoDon't start Window enter animation as a result of AWT becoming visible.
chaviw [Mon, 16 Apr 2018 22:29:38 +0000 (15:29 -0700)]
Don't start Window enter animation as a result of AWT becoming visible.

There are some cases where AWT becomes visible without an animation. It
will then start a WindowState enter animation if WS is not visible yet.
However, this is problematic since the WS may not be ready to become
visible yet. For example, relayout may not have been called yet to
create a surface and the size of the surface is not yet set. This causes
problems when determining the position of the leash when the animation
is created. Instead allow the WS relayout to handle starting the
enter animation so the WS is set properly.
As for the case where AWT is becoming not visible without an animation, but
WS is still visible, create an exit animation for the WS. This is
because there won't be a client to trigger this animation.

Change-Id: Ic9215a0c96f219f5bc87b16067755af582883a5d
Fixes: 77447982
Test: Issue from bug

6 years agoChecks that secondary instrumentation ABI matches
Patrick Baumann [Tue, 17 Apr 2018 16:49:55 +0000 (09:49 -0700)]
Checks that secondary instrumentation ABI matches

This adds checks that the secondary ABI for an instrumentation package
matchs that of its target before using it when forced and warns of
mismatches.

Change-Id: I394427721c83cbd1c3c6af6cee24a93b18d8c65f
Fixes: 77152863
Test: gts-tradefed > run gts -m GtsBackupHostTestCases -a armeabi-v7a do not all fail with NPE

6 years agoMerge "Fix FDE" into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 16:48:29 +0000 (16:48 +0000)]
Merge "Fix FDE" into pi-dev

6 years agoMerge "StackDivider: Make sure that changed stable insets get dispatched" into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 16:29:31 +0000 (16:29 +0000)]
Merge "StackDivider: Make sure that changed stable insets get dispatched" into pi-dev

6 years agoMerge "Don't crash apps on notification error" into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 16:29:24 +0000 (16:29 +0000)]
Merge "Don't crash apps on notification error" into pi-dev

6 years agoMerge "Fix incidentd skip collecting timedout of a section." into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 16:22:20 +0000 (16:22 +0000)]
Merge "Fix incidentd skip collecting timedout of a section." into pi-dev

6 years agoMerge "Refactored the UserRecyclerGridView to use PagedListView from the car support...
TreeHugger Robot [Tue, 17 Apr 2018 15:31:08 +0000 (15:31 +0000)]
Merge "Refactored the UserRecyclerGridView to use PagedListView from the car support library.  This also surfaced a scrollbar. Additionally, added a touch ripple when you touch a user's picture and disabled the user buttons once a profile is selected" into pi-dev

6 years agoDon't crash apps on notification error
Julia Reynolds [Tue, 17 Apr 2018 13:36:30 +0000 (09:36 -0400)]
Don't crash apps on notification error

Apps cannot recover from this error, and crashing is a bad user
experience.

Test: none
Bug: 30529567
Change-Id: I088ab04f8efeb5fa2483520141c54e90ff441ba4

6 years agoSet accessibility action label for smart replies.
Milo Sredkov [Tue, 17 Apr 2018 13:04:54 +0000 (14:04 +0100)]
Set accessibility action label for smart replies.

Currently the TalkBack reads something like "I am here, button,
double-tap to activate". Set an accessiblity delegate that changes
the click action label to "send", so the TalkBack message becomes
"I am here, button, double-tap to send".

Bug: 72216277
Test: In Notify post a notification with choices. Read it via TalkBack.
Change-Id: Ib50f6ff6f698196d905aea2e303b6bd2e5531587

6 years agoMerge "Have doze update the scrim controller rather than the scrim state." into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 15:13:27 +0000 (15:13 +0000)]
Merge "Have doze update the scrim controller rather than the scrim state." into pi-dev

6 years agoVol dialog uses A11yServicesStateChangeListener
Beverly [Mon, 16 Apr 2018 21:47:39 +0000 (17:47 -0400)]
Vol dialog uses A11yServicesStateChangeListener

Use AccessibilityServicesStateChangeListener instead of
AccessibilityStateChangeListener to check for a11y changes.

Bug: 72825761
Test: manual
Change-Id: Ib052b261a92622554d5ccf488d5e882943bcf77d

6 years agoMake VR brightness adjustable again.
Santos Cordon [Sat, 14 Apr 2018 00:10:54 +0000 (17:10 -0700)]
Make VR brightness adjustable again.

After some code adjustment, changes to VR's brightness setting
were not respected.  Add code to listen for the changes and clamping
code to support the min & max values for VR brightness.

Bug: 73090564

Test: while in VR mode, verify that the following command updates
brightness: 'adb shell system put screen_brightness_for_vr
<VALUE>'

Change-Id: I1ce411c5b5fff11c40d1a6ac0b20588b69d2e64e

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 14:43:28 +0000 (14:43 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Only apply window insets to QS status bar." into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 14:39:23 +0000 (14:39 +0000)]
Merge "Only apply window insets to QS status bar." into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 14:35:24 +0000 (14:35 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 14:34:35 +0000 (14:34 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Greylist getMandatoryBackupTransport" into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 14:14:53 +0000 (14:14 +0000)]
Merge "Greylist getMandatoryBackupTransport" into pi-dev

6 years agoMerge "Bold the battery saver '+' icon" into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 13:28:42 +0000 (13:28 +0000)]
Merge "Bold the battery saver '+' icon" into pi-dev

6 years agoString update for effect suppressors
Julia Reynolds [Tue, 17 Apr 2018 13:08:12 +0000 (09:08 -0400)]
String update for effect suppressors

Test: manual inspection
Bug: 77641315
Change-Id: Icebb351a4ad63d063c4bf78c2ec35a7d9ba02440

6 years agoHave doze update the scrim controller rather than the scrim state.
Michael Wright [Mon, 16 Apr 2018 22:13:54 +0000 (23:13 +0100)]
Have doze update the scrim controller rather than the scrim state.

Right now, when Doze wants to update the front alpha in AOD, it updates
the scrim state's front alpha value. Unfortunately, this is only looked
at when transitioning into the state, but entirely ignored once we're in
it. With this, we instead tell the scrim controller which tells the
scrim state but also updates the current front scrim alpha if we're
currently in the AOD state.

Bug: 78124574
Bug: 70939994
Test: atest ScrimControllerTest\#transitionToAod_withFrontAlphaUpdates
Change-Id: I09b33208bd3e3fd6d3829b33776364aa7b61a4f6

6 years agoGreylist getMandatoryBackupTransport
Artem Iglikov [Tue, 17 Apr 2018 11:08:28 +0000 (12:08 +0100)]
Greylist getMandatoryBackupTransport

Bug: 77997957
Test: n/a
Change-Id: Ieccdd978960c00b6bef6ebe375fa388c0d186684

6 years agoMerge "LSS: pass secret to AuthSecret HAL when no credential" into pi-dev
Andrew Scull [Tue, 17 Apr 2018 11:04:52 +0000 (11:04 +0000)]
Merge "LSS: pass secret to AuthSecret HAL when no credential" into pi-dev

6 years agoMerge "Docs: update the method description for installKeyPair() to cover parameter...
TreeHugger Robot [Tue, 17 Apr 2018 10:53:36 +0000 (10:53 +0000)]
Merge "Docs: update the method description for installKeyPair() to cover parameter change." into pi-dev

6 years agoMerge "Do not generate non-primary profile watchlist report" into pi-dev
Ricky Wai [Tue, 17 Apr 2018 10:40:21 +0000 (10:40 +0000)]
Merge "Do not generate non-primary profile watchlist report" into pi-dev

6 years agoMerge "Fixed power manager CTS test." into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 10:39:30 +0000 (10:39 +0000)]
Merge "Fixed power manager CTS test." into pi-dev

6 years agoLSS: pass secret to AuthSecret HAL when no credential
Andrew Scull [Fri, 13 Apr 2018 11:01:25 +0000 (12:01 +0100)]
LSS: pass secret to AuthSecret HAL when no credential

If there was once a credential, a secret will have been enrolled. When
the credential is removed, that secret is still enrolled but still needs
to be derived. This adds that derivation in the case that the secret is
enrolled by the user doesn't have a credential.

Bug: 77942316
Test: runtest frameworks-services -c com.android.server.locksettings.SyntheticPasswordTests
Change-Id: I099a9537ab0739830a234b5f4f3721f4e8476571

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 17 Apr 2018 08:17:05 +0000 (01:17 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ibc9a21a13715a33e760e42dedd74ce7fad9d9c00

6 years agoMerge "Make util method public" into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 07:22:25 +0000 (07:22 +0000)]
Merge "Make util method public" into pi-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 17 Apr 2018 06:31:23 +0000 (23:31 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I54a625e6118d6143dce89b06c9a0246e147c800e

6 years agoMerge "[JNI] Adapt graphics::common:V1_0::Hdr from HAL." into pi-dev
Peiyong Lin [Tue, 17 Apr 2018 05:57:30 +0000 (05:57 +0000)]
Merge "[JNI] Adapt graphics::common:V1_0::Hdr from HAL." into pi-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 17 Apr 2018 04:27:06 +0000 (21:27 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Id8b353491f4bf2e0931fa1151e98b59614b52ffe

6 years agoMerge "Enforce dump permission in stats service" into pi-dev
Tej Singh [Tue, 17 Apr 2018 01:34:47 +0000 (01:34 +0000)]
Merge "Enforce dump permission in stats service" into pi-dev

6 years agoMerge "[QS] Add PageIndicator to footer" into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 01:28:06 +0000 (01:28 +0000)]
Merge "[QS] Add PageIndicator to footer" into pi-dev

6 years agoRefactored the UserRecyclerGridView to use PagedListView from the
Aarthi Balachander [Thu, 12 Apr 2018 01:41:52 +0000 (18:41 -0700)]
Refactored the UserRecyclerGridView to use PagedListView from the
car support library.  This also surfaced a scrollbar.
Additionally, added a touch ripple when you touch a
user's picture and disabled the user buttons once a profile is
selected

Test: tested on Mojave
bug: 778707487786952277870549
Change-Id: I3706f1089c7c91e8db8d9126a269fd984e2b5dc9

6 years agoMerge "Only fade clock away at the top of the screen" into pi-dev
Lucas Dupin [Tue, 17 Apr 2018 00:14:22 +0000 (00:14 +0000)]
Merge "Only fade clock away at the top of the screen" into pi-dev

6 years agoMerge "Add 1-day sync stats in syncmanager dumpsys." into pi-dev
Makoto Onuki [Tue, 17 Apr 2018 00:11:25 +0000 (00:11 +0000)]
Merge "Add 1-day sync stats in syncmanager dumpsys." into pi-dev

6 years agoMerge "InstantAppRegistry: adjust backwards compat cookie sig check." into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 00:09:14 +0000 (00:09 +0000)]
Merge "InstantAppRegistry: adjust backwards compat cookie sig check." into pi-dev

6 years agoMerge "Add tracing for network statistics and policy." into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 00:08:41 +0000 (00:08 +0000)]
Merge "Add tracing for network statistics and policy." into pi-dev

6 years agoMerge "Protect usage data with OP_GET_USAGE_STATS." into pi-dev
Jeff Sharkey [Tue, 17 Apr 2018 00:04:53 +0000 (00:04 +0000)]
Merge "Protect usage data with OP_GET_USAGE_STATS." into pi-dev

6 years agoMerge "Fix UiccSlotInfo equals method." into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 23:56:06 +0000 (23:56 +0000)]
Merge "Fix UiccSlotInfo equals method." into pi-dev

6 years agoMerge "Treat named standby states as ceilings of behavioral categories" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 23:48:41 +0000 (23:48 +0000)]
Merge "Treat named standby states as ceilings of behavioral categories" into pi-dev

6 years agoMerge "Remove setDeviceConnectionState hack for radio mute/unmute." into pi-dev
Tomasz Wasilczyk [Mon, 16 Apr 2018 23:37:10 +0000 (23:37 +0000)]
Merge "Remove setDeviceConnectionState hack for radio mute/unmute." into pi-dev

6 years agoMake util method public
Salvador Martinez [Fri, 13 Apr 2018 20:34:46 +0000 (13:34 -0700)]
Make util method public

A utility method is private but we need it elsewhere. This CL
just makes it public. Also it restricts the use of the method to
just rounding positive values to positive multiples. It is only
meant for rounding time.

Test: robotests
Bug: 77874313
Change-Id: Ieb222c7f752b6a907fca5f91ddd4f4a4b67a0d2a

6 years agoMerge "Camera: Fix a description for MONOCHROME camera capability" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 23:25:39 +0000 (23:25 +0000)]
Merge "Camera: Fix a description for MONOCHROME camera capability" into pi-dev

6 years agoMerge "Add permission whitelist for EmergencyInfo app." into pi-dev
Tyler Gunn [Mon, 16 Apr 2018 23:23:39 +0000 (23:23 +0000)]
Merge "Add permission whitelist for EmergencyInfo app." into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 22:57:27 +0000 (22:57 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Adds a code when statsd sends intent to getData." into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 22:46:03 +0000 (22:46 +0000)]
Merge "Adds a code when statsd sends intent to getData." into pi-dev

6 years agoMerge "Add A2DP set/get active device to greylist" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 22:41:38 +0000 (22:41 +0000)]
Merge "Add A2DP set/get active device to greylist" into pi-dev

6 years agoMerge "Replace PackageInfo#signingCertificateHistory field doc reference." into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 22:40:56 +0000 (22:40 +0000)]
Merge "Replace PackageInfo#signingCertificateHistory field doc reference." into pi-dev

6 years agoMerge "Dismiss low battery warning on toggling saver." into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 22:19:45 +0000 (22:19 +0000)]
Merge "Dismiss low battery warning on toggling saver." into pi-dev

6 years agoMerge "Remove implementation of deprecated RecoveryController methods." into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 22:14:22 +0000 (22:14 +0000)]
Merge "Remove implementation of deprecated RecoveryController methods." into pi-dev

6 years agoMerge "Remove streams from system_server" into pi-dev
Julia Reynolds [Mon, 16 Apr 2018 22:13:07 +0000 (22:13 +0000)]
Merge "Remove streams from system_server" into pi-dev

6 years agoMerge "Fix instant app badge" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 22:08:33 +0000 (22:08 +0000)]
Merge "Fix instant app badge" into pi-dev

6 years agoAdd A2DP set/get active device to greylist
Pavlin Radoslavov [Mon, 16 Apr 2018 21:36:00 +0000 (14:36 -0700)]
Add A2DP set/get active device to greylist

Bug: 74238896
Bug: 78132844
Test: compile
Change-Id: If20ed03e6f579f06856e3e9cb6d4882313bfdc1b

6 years agoEnforce dump permission in stats service
Tej Singh [Wed, 11 Apr 2018 00:24:50 +0000 (17:24 -0700)]
Enforce dump permission in stats service

Enforces the dump permission in stats service and fixes a typo in an
enum name.

Bug: b/77723108
Test: adb shell dumpsys stats as root and not root
Test: build success on marlin (and cts build success)
Change-Id: I131f97fe4fd370d50bc4ad369377f6adcca5f6ae

6 years agoMerge "Remove unnecessary disk access when loading synthetic password states" into...
Rubin Xu [Mon, 16 Apr 2018 21:58:33 +0000 (21:58 +0000)]
Merge "Remove unnecessary disk access when loading synthetic password states" into pi-dev

6 years agoBold the battery saver '+' icon
Evan Laird [Fri, 13 Apr 2018 17:20:44 +0000 (13:20 -0400)]
Bold the battery saver '+' icon

Now with 50% more width!
Now with 50% more colorError!

Test: visual
Change-Id: I21d4cecf5e1f3ae4dd2d7a7e5b372591e2ff83a3
Fixes: 74764821

6 years agoReplace PackageInfo#signingCertificateHistory field doc reference.
Dan Cashman [Mon, 16 Apr 2018 21:41:24 +0000 (14:41 -0700)]
Replace PackageInfo#signingCertificateHistory field doc reference.

During API review, PackageInfo#signingCertificateHistory was changed
to PackageInfo#signingInfo.  This was not reflected everywhere in
the documentation.  Update it.

Bug: 74831530
Test: Doc change only, builds.
Change-Id: I497cdd732dffacf376ac05f7ccd181004c947210

6 years agoMerge "Use OS package name when identity cleared." into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 21:43:58 +0000 (21:43 +0000)]
Merge "Use OS package name when identity cleared." into pi-dev

6 years agoMerge "Allow left-right swiping from edges in QS." into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 21:22:55 +0000 (21:22 +0000)]
Merge "Allow left-right swiping from edges in QS." into pi-dev

6 years agoMerge "Always show or hide volume dialog" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 21:19:15 +0000 (21:19 +0000)]
Merge "Always show or hide volume dialog" into pi-dev

6 years agoInstantAppRegistry: adjust backwards compat cookie sig check.
Dan Cashman [Mon, 16 Apr 2018 21:18:48 +0000 (14:18 -0700)]
InstantAppRegistry: adjust backwards compat cookie sig check.

InstantAppRegistry used to store cookies based on the hash of only
one of the signing certificates out of potentially multiple signing
certificates.  To prevent loss of stored cookie info for an app which
has multiple signing certificates, it needs to check if the stored hash
value corresponded to only one of those certs before this was corrected.
Since the order of signing certificates is not specified, all cert hashes
should be compared to see if one of them matches the stored value.

Bug: 73739156
Test: android.appsecurity.cts.InstantCookieHostTest#testCookieValidWhenSingedWithTwoCerts
Change-Id: I2d616ca7ba60104f0b009d23e8eb4e7f525362fd

6 years agoOnly apply window insets to QS status bar.
Amin Shaikh [Mon, 16 Apr 2018 20:00:12 +0000 (16:00 -0400)]
Only apply window insets to QS status bar.

Do not adjust QQS and system icons layout based on cutouts.

Change-Id: I3ec5915ecdfd654e960b74b42cc15dc0672d13e0
Fixes: 77457012
Test: visual

6 years agoMerge "Fix typos." into pi-dev
Jiuyu Sun [Mon, 16 Apr 2018 20:48:52 +0000 (20:48 +0000)]
Merge "Fix typos." into pi-dev

6 years agoMerge changes from topic "am-281eb700-c15a-44d3-a49f-153f9323e62a" into oc-dev am...
Bill Yi [Mon, 16 Apr 2018 20:47:20 +0000 (13:47 -0700)]
Merge changes from topic "am-281eb700-c15a-44d3-a49f-153f9323e62a" into oc-dev am: 231719b4d2 am: 60fb81edda
am: f84cc88320

Change-Id: I6cd93c965df3aa652a1b669df2a88acd3a6c4e24

6 years agoFix incidentd skip collecting timedout of a section.
Yi Jin [Thu, 12 Apr 2018 18:15:39 +0000 (11:15 -0700)]
Fix incidentd skip collecting timedout of a section.

By moving the section stats collection before any return statements,
it won't missing stats collection.

Bug: 77962855
Test: atest incidentd_test
Change-Id: I0900556428c51636e24df48a407eb916ccff795c

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: c425155ab8 skipped...
Bill Yi [Mon, 16 Apr 2018 20:42:12 +0000 (13:42 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: c425155ab8 skipped: b230479553 am: fde5e09eeb  -s ours am: 490f12c8c1  -s ours
am: 0af21ab046  -s ours

Change-Id: If9dff24f3fff2a9916d74874e2bc682b5a037c8d

6 years ago[automerger skipped] [automerger] Import translations. DO NOT MERGE am: ba2da34cdf...
Bill Yi [Mon, 16 Apr 2018 20:27:02 +0000 (13:27 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am: ba2da34cdf skipped: 9812374054 am: bfcb8b99a5  -s ours am: f62419973f  -s ours
am: d9352518aa  -s ours

Change-Id: Idc313d4c705d68edb65c057dfc5eb6e8e9efa80e

6 years ago[automerger skipped] [automerger] Import translations. DO NOT MERGE am: aaf2bd3c6d...
Bill Yi [Mon, 16 Apr 2018 20:24:55 +0000 (13:24 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am: aaf2bd3c6d skipped: 8383370425 am: cb80417eab  -s ours am: 3194fdd40a  -s ours
am: 923f65751a  -s ours

Change-Id: I8b64a8fbbbcd92a6a949bcae98b44f37c0a4e09c

6 years ago[automerger skipped] [automerger] Import translations. DO NOT MERGE am: c7fe3a5972...
Bill Yi [Mon, 16 Apr 2018 20:23:17 +0000 (13:23 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am: c7fe3a5972 skipped: 9a64c59288 am: 67841fe1e6  -s ours am: 97ddc81da4  -s ours
am: 3b3379f16a  -s ours

Change-Id: I24f1dae0a8fc333cd2668f1085a81c1755a37707

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 9b8bceedc2 skipped...
Bill Yi [Mon, 16 Apr 2018 20:21:23 +0000 (13:21 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 9b8bceedc2 skipped: 1789ac6b28 am: d12aff917a  -s ours am: 06e9f9dad5  -s ours
am: 06ce4b2618  -s ours

Change-Id: I21bade1db7ee51f5ccbdd4afd08f3399c2e886e7

6 years agoMerge changes from topic "ClearGrantIfGroupChanged-nyc" into oc-dev am: 6173fbe12e...
Philip P. Moltmann [Mon, 16 Apr 2018 20:19:04 +0000 (13:19 -0700)]
Merge changes from topic "ClearGrantIfGroupChanged-nyc" into oc-dev am: 6173fbe12e am: 6a845fe056
am: 1d9e95553b

Change-Id: Icb9e0c7261da6147d7d70be9f243fb387799c58f

6 years agoFix UiccSlotInfo equals method.
Malcolm Chen [Sat, 14 Apr 2018 02:33:08 +0000 (19:33 -0700)]
Fix UiccSlotInfo equals method.

In UiccSlotInfo#equals method, it's comparing Strings incorrectly.

Bug: 78033760
Test: GTS test
Change-Id: I4fed0a70ee0ef06bcf7a1af544e6aebced31d9c2

6 years ago[automerger skipped] [automerger] DO NOT MERGE (M) Revoke permision when group change...
Philip P. Moltmann [Mon, 16 Apr 2018 19:50:03 +0000 (12:50 -0700)]
[automerger skipped] [automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53 am: 5630564178 am: 90cb8f7b6e skipped: 275e6bf1b4 am: 1bbc69d8f5 am: 8dbf706e9f am: 874fe98a8f am: 9b71a72cb0 skipped: f1776f0805 am: 877a845005 am: 885bcab242
am: c201aff50a  -s ours

Change-Id: Ie8b5e0cabb3abfa917653993f1010b3c5db7e5af

6 years agoTreat named standby states as ceilings of behavioral categories
Christopher Tate [Tue, 27 Mar 2018 23:04:14 +0000 (16:04 -0700)]
Treat named standby states as ceilings of behavioral categories

For purposes of alarm dispatch & job execution, intermediate standby
states are now treated as the ceilings of the range associated with each
bucket, rather than as the floor.  So, for example, a value that is
between STANDBY_BUCKET_WORKING_SET and STANDBY_BUCKET_ACTIVE is now
treated as equivalent to STANDBY_BUCKET_WORKING_SET.

Bug: 77154340
Test: atest CtsJobSchedulerTestCases
Change-Id: I84d010863eecaac011dd117205980254487bfa64

6 years agoAdd tracing for network statistics and policy.
Jeff Sharkey [Thu, 12 Apr 2018 20:26:32 +0000 (14:26 -0600)]
Add tracing for network statistics and policy.

These trace points surround areas of heavy lifting to help us debug
code that might be taking longer than expected.  (For example, slow
getting data from eBPF, slow recording into data structures, slow
writing to disk, or slow evaluating policy.)

Typical timings on a taimen:

performPollLocked:   25.5ms
snapshotUid:          4.4ms
snapshotXt:           1.4ms
[persisting]:        13.4ms
updateNotifications:  3.3ms

Bug: 77908520778085467785323877154412
Test: builds, boots
Change-Id: I072bfecffee01eeec7e4cbad439bd1cdc166febc

6 years agoMerge "Revert "AAPT: Modified StringPool uniqueness detection"" into pi-dev
Ryan Mitchell [Mon, 16 Apr 2018 19:28:43 +0000 (19:28 +0000)]
Merge "Revert "AAPT: Modified StringPool uniqueness detection"" into pi-dev

6 years agoMerge "Enable feature flag for audio output switcher." into pi-dev
Caxton Chan [Mon, 16 Apr 2018 19:24:31 +0000 (19:24 +0000)]
Merge "Enable feature flag for audio output switcher." into pi-dev

6 years agoAdd 1-day sync stats in syncmanager dumpsys.
Makoto Onuki [Wed, 11 Apr 2018 23:24:46 +0000 (16:24 -0700)]
Add 1-day sync stats in syncmanager dumpsys.

The stats currently shown in sync manager dumpsys is the total *since wipe* so
they're usually pretty much useless.

So let's add "today" and "yesterday" stats too.

- Also add "# failures" and "# cancels".
- Also split up SERVER to OTHER and FEED (i.e. subscribedfeeds).

Bug: 76035392
Test: Boot, run some sync, then do "cmd content reset-today-stats"
- Also tested with actually setting the clock to 23:59 and wait
- Check the result with "dumpsys content".

Sample output:
=======================================================================
Authority                                           Syncable  Enabled  Stats  Loc  Poll  Per  Feed  User  Othr  Tot  Fail  Can  Time  Last Sync            Backoff
------------------------------------------------------------------------------------------------------------------------------------------------------------------
com.android.calendar                                1         true     Total  0    0     0    1     0     7     8    0     2    8s    FEED SUCCESS
                                                                       Today                  1           5     6               7s    2018-04-12 15:21:24
                                                                       Yestr                                                    0s
com.android.chrome                                  0         false    Total  0    0     0    0     0     0     0    0     0    0s
                                                                       Today                                                    0s

Change-Id: Id0ea42435a9f759e47d4b9490292759270f8e9a5

6 years agoCamera: Fix a description for MONOCHROME camera capability
Hidenari Koshimae [Wed, 11 Apr 2018 09:37:44 +0000 (18:37 +0900)]
Camera: Fix a description for MONOCHROME camera capability

Test: Compile
Bug: 77902724
Change-Id: Ibb6a1d4b5f80a0c4d0e3f29625b03a827a3ed80c

6 years agoMerge changes from topic "am-281eb700-c15a-44d3-a49f-153f9323e62a" into oc-dev am...
Bill Yi [Mon, 16 Apr 2018 19:20:42 +0000 (12:20 -0700)]
Merge changes from topic "am-281eb700-c15a-44d3-a49f-153f9323e62a" into oc-dev am: 231719b4d2
am: 60fb81edda

Change-Id: I5933e96aa34fc6aff073513bdb0400fd02796e62

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: c425155ab8 skipped...
Bill Yi [Mon, 16 Apr 2018 19:16:09 +0000 (12:16 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: c425155ab8 skipped: b230479553 am: fde5e09eeb  -s ours
am: 490f12c8c1  -s ours

Change-Id: I5c1579d596c4f444ebee20cf217c3e4872182d0c

6 years ago[automerger skipped] [automerger] Import translations. DO NOT MERGE am: ba2da34cdf...
Bill Yi [Mon, 16 Apr 2018 19:14:27 +0000 (12:14 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am: ba2da34cdf skipped: 9812374054 am: bfcb8b99a5  -s ours
am: f62419973f  -s ours

Change-Id: I37dbec1d64219b2c2b57da0535364606b527f3f3

6 years agoMerge changes from topic "am-281eb700-c15a-44d3-a49f-153f9323e62a" into oc-dev
Bill Yi [Mon, 16 Apr 2018 19:01:52 +0000 (12:01 -0700)]
Merge changes from topic "am-281eb700-c15a-44d3-a49f-153f9323e62a" into oc-dev
am: 231719b4d2

Change-Id: I5186692869d8849e0abc8d60f97970ce07e273aa

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: c425155ab8 skipped...
Bill Yi [Mon, 16 Apr 2018 19:00:03 +0000 (12:00 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: c425155ab8 skipped: b230479553
am: fde5e09eeb  -s ours

Change-Id: Ife2f1cabaad48b2b89dfe46c6de4f1cfa18c27cc

6 years ago[automerger skipped] [automerger] Import translations. DO NOT MERGE am: aaf2bd3c6d...
Bill Yi [Mon, 16 Apr 2018 18:58:54 +0000 (11:58 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am: aaf2bd3c6d skipped: 8383370425 am: cb80417eab  -s ours
am: 3194fdd40a  -s ours

Change-Id: I67f37180a53bdd87975f458ce68ae75890ebec29

6 years ago[automerger skipped] [automerger] Import translations. DO NOT MERGE am: ba2da34cdf...
Bill Yi [Mon, 16 Apr 2018 18:56:07 +0000 (11:56 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am: ba2da34cdf skipped: 9812374054
am: bfcb8b99a5  -s ours

Change-Id: I9573bb5fb938d29fbd40c94bb36203607bacdfee

6 years agoRemove setDeviceConnectionState hack for radio mute/unmute.
Tomasz Wasilczyk [Fri, 13 Apr 2018 18:41:22 +0000 (11:41 -0700)]
Remove setDeviceConnectionState hack for radio mute/unmute.

Bug: 77863406
Test: it builds, it didn't work anyway
Change-Id: Ib77d34d4c425e341faa52c6e99f7e289be04f433

6 years ago[automerger skipped] [automerger] Import translations. DO NOT MERGE am: c7fe3a5972...
Bill Yi [Mon, 16 Apr 2018 18:55:52 +0000 (11:55 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am: c7fe3a5972 skipped: 9a64c59288 am: 67841fe1e6  -s ours
am: 97ddc81da4  -s ours

Change-Id: I0a2be41354fd01b370c95f0f77d67c878bb84d55

6 years ago[automerger skipped] Merge "DO NOT MERGE (O) Revoke permision when group changed...
Philip P. Moltmann [Mon, 16 Apr 2018 18:55:42 +0000 (11:55 -0700)]
[automerger skipped] Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev am: cda08919cf am: d139755de8
am: 5e2a5a8ce1  -s ours

Change-Id: I665c1f65a60926a70627db83da5c2c6f3e4f09c8

6 years ago[automerger skipped] [automerger] Import translations. DO NOT MERGE am: aaf2bd3c6d...
Bill Yi [Mon, 16 Apr 2018 18:52:51 +0000 (11:52 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am: aaf2bd3c6d skipped: 8383370425
am: cb80417eab  -s ours

Change-Id: I29e67171958497655f4d0374b2decbc1429135f7

6 years ago[automerger skipped] [automerger] Import translations. DO NOT MERGE am: c7fe3a5972...
Bill Yi [Mon, 16 Apr 2018 18:49:23 +0000 (11:49 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am: c7fe3a5972 skipped: 9a64c59288
am: 67841fe1e6  -s ours

Change-Id: Ic7684c0d86e85aaebfb4e459d4dbd57d0d67d3b9