OSDN Git Service
Jack Yu [Fri, 13 Jul 2018 20:56:16 +0000 (13:56 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Revert "Hide IWLAN system API"" into stage-aosp-master am:
1bee26f4c3 -s ours
am:
7604760e22 -s ours
Change-Id: I18410bc47cf77987fef4fbb977bec82e953c839f
Lucas Dupin [Fri, 13 Jul 2018 20:50:48 +0000 (20:50 +0000)]
Merge "Activate night mode when battery saver"
Tyler Gunn [Fri, 13 Jul 2018 20:22:48 +0000 (13:22 -0700)]
Merge "Make Connection#onSilence a public API." am:
cbe3737f13 am:
01ab0b90bf
am:
9aca012ab5
Change-Id: Icf3491038487e47983b84255cdc32214595ce470
Yueming Wang [Fri, 13 Jul 2018 20:14:26 +0000 (13:14 -0700)]
[automerger skipped] Merge "Revert "Update SubscriptionInfo o use strings for mccmnc"" am:
f92ad05fa5 -s ours am:
6dd8f735d2 -s ours
am:
0aff4a19f9 -s ours
Change-Id: Ifd7fa2a83fa262a9c7ae72f80274033f604ebb25
Jack Yu [Fri, 13 Jul 2018 20:06:31 +0000 (13:06 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Revert "Hide IWLAN system API"" into stage-aosp-master
am:
1bee26f4c3 -s ours
Change-Id: I236396a3080e5b435db417ba2ed10485232976ec
Shrijana Ghimire [Fri, 13 Jul 2018 19:48:15 +0000 (12:48 -0700)]
Merge "Merge "docs: Fixed typos in AdapterView Javadoc." into pi-dev am:
9ef41ccf42" into pi-dev-plus-aosp
am:
74ecab8a44
Change-Id: I676fa766b26ecfc145ed4d5dd60b1af70dc99529
Tyler Gunn [Fri, 13 Jul 2018 19:45:28 +0000 (12:45 -0700)]
Merge "Make Connection#onSilence a public API." am:
cbe3737f13
am:
01ab0b90bf
Change-Id: I8c011d4a495d5240ebec83b07bc0b8f57a3c40ac
Jack Yu [Fri, 13 Jul 2018 19:38:03 +0000 (12:38 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Revert "Hide IWLAN system API"" into pi-dev-plus-aosp
am:
2e1eb41ec1 -s ours
Change-Id: I4614419886138038f4ee7c2fa317d012806d022c
Yueming Wang [Fri, 13 Jul 2018 19:36:51 +0000 (12:36 -0700)]
[automerger skipped] Merge "Revert "Update SubscriptionInfo o use strings for mccmnc"" am:
f92ad05fa5 -s ours
am:
6dd8f735d2 -s ours
Change-Id: I6cb9a490d20e71432ea7f6afd87ae58a5570d34e
Android Build Merger (Role) [Fri, 13 Jul 2018 19:30:22 +0000 (19:30 +0000)]
Merge "Merge "docs: Fixed typos in AdapterView Javadoc." into pi-dev am:
9ef41ccf42" into pi-dev-plus-aosp
Shrijana Ghimire [Fri, 13 Jul 2018 19:29:55 +0000 (12:29 -0700)]
Merge "docs: Fixed typos in AdapterView Javadoc." into pi-dev
am:
9ef41ccf42
Change-Id: I03291b3758127de3bfef480a6561930f5901014c
Jack Yu [Fri, 13 Jul 2018 19:28:23 +0000 (19:28 +0000)]
Merge "DO NOT MERGE - Revert "Hide IWLAN system API"" into stage-aosp-master
Jack Yu [Fri, 13 Jul 2018 19:28:11 +0000 (19:28 +0000)]
Merge "DO NOT MERGE - Revert "Hide IWLAN system API"" into pi-dev-plus-aosp
Bill Yi [Fri, 13 Jul 2018 19:25:30 +0000 (12:25 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
762470b663 -s ours
am:
f734167154 -s ours
Change-Id: Ifb7fb7717bcebd0a94e8906a539d6377a5f2b31f
Tyler Gunn [Fri, 13 Jul 2018 19:15:45 +0000 (12:15 -0700)]
Merge "Make Connection#onSilence a public API."
am:
cbe3737f13
Change-Id: I4ab192ca160219770d7384e88c8e0025137b42bd
Yueming Wang [Fri, 13 Jul 2018 19:10:40 +0000 (12:10 -0700)]
[automerger skipped] Merge "Revert "Update SubscriptionInfo o use strings for mccmnc""
am:
f92ad05fa5 -s ours
Change-Id: If211a292335419751be21e670b1ddb489d3c54b4
Bill Yi [Fri, 13 Jul 2018 19:08:05 +0000 (12:08 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
762470b663 -s ours
Change-Id: If96f549175221087b8e5942ff286928b1bcb7f22
TreeHugger Robot [Fri, 13 Jul 2018 19:07:37 +0000 (19:07 +0000)]
Merge "Import translations. DO NOT MERGE"
Shrijana Ghimire [Fri, 13 Jul 2018 19:03:24 +0000 (19:03 +0000)]
Merge "docs: Fixed typos in AdapterView Javadoc." into pi-dev
Brad Stenning [Fri, 13 Jul 2018 19:01:11 +0000 (19:01 +0000)]
Merge "Add an assist mic to the navigation bar"
TreeHugger Robot [Fri, 13 Jul 2018 18:56:33 +0000 (18:56 +0000)]
Merge "Add partial request arc init/terminate handlers and tests"
TreeHugger Robot [Fri, 13 Jul 2018 18:40:05 +0000 (18:40 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Fri, 13 Jul 2018 18:39:37 +0000 (11:39 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
c2f735b844 -s ours
am:
3d87fa503d -s ours
Change-Id: If556e6f195e2d80d576052c35847722800aac807
TreeHugger Robot [Fri, 13 Jul 2018 18:35:52 +0000 (18:35 +0000)]
Merge "ValueMetric supports multiple aggregation types"
Bill Yi [Fri, 13 Jul 2018 18:26:02 +0000 (11:26 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
c2f735b844 -s ours
Change-Id: Ia4f46d8b32b0158ffb8f3861399a6bd36f0d4275
TreeHugger Robot [Fri, 13 Jul 2018 18:25:28 +0000 (18:25 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 13 Jul 2018 18:04:45 +0000 (18:04 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bernie Innocenti [Fri, 13 Jul 2018 17:49:00 +0000 (10:49 -0700)]
[automerger skipped] Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-dev am:
8f1c70e49b am:
d1f53d13a9 -s ours am:
213af1a79e -s ours am:
66bbd64d7d -s ours
am:
e4dc066e12 -s ours
Change-Id: Idd1f7eb3d18f9f8fd0601069ec583e64b52e1f10
Amy [Thu, 7 Jun 2018 23:24:31 +0000 (16:24 -0700)]
Add partial request arc init/terminate handlers and tests
Test: atest com.android.server.hdmi
Change-Id: I92ee4598ccb2e6c88863ab0ba3dc3ba682ccd0e2
(cherry picked from commit
5dc9609a08c43ca4134b1eccaea2f23a1681bd61)
Jack Yu [Fri, 13 Jul 2018 17:32:20 +0000 (10:32 -0700)]
DO NOT MERGE - Revert "Hide IWLAN system API"
This reverts commit
ea440a765e2774320910073e5350bdccd39afb6c, reversing
changes made to
0b90c524cb8288f3b8d8111b5724c02630c5b4c6.
Test: Build
Bug:
73659459
Change-Id: I2c52f17090040cea589081c3ed412a14986e3d85
Chenjie Yu [Fri, 6 Jul 2018 23:14:34 +0000 (16:14 -0700)]
ValueMetric supports multiple aggregation types
1. Add support for MIN, MAX, AVG
2. ValueMetric also allow floats now, in addition to long data type.
AnomalyDetection still takes long only. I am not sure if it makes
sense to do anomaly on AVG. I will leave that for later.
3. ValueMetric supports sliced condition change for pushed events.
I don't think it makes sense for pulled events to have sliced condition
changes so leave it for now.
Test: unit test
Change-Id: I8bc510d98ea9b8a6eb16d04ff99dce6b574249cd
TreeHugger Robot [Fri, 13 Jul 2018 17:16:40 +0000 (17:16 +0000)]
Merge changes I7021de43,I2854764d
* changes:
Ignore notification from other users
Fix smart action is not enabled in first whatsapp notification
Bernie Innocenti [Fri, 13 Jul 2018 17:14:24 +0000 (10:14 -0700)]
[automerger skipped] Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-dev am:
8f1c70e49b am:
d1f53d13a9 -s ours am:
213af1a79e -s ours
am:
66bbd64d7d -s ours
Change-Id: I58c75d2ec05c1470cabed265fa6d4e095ff698b8
Tyler Gunn [Fri, 13 Jul 2018 17:02:36 +0000 (17:02 +0000)]
Merge "Make Connection#onSilence a public API."
Bernie Innocenti [Fri, 13 Jul 2018 17:01:06 +0000 (10:01 -0700)]
[automerger skipped] Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-mr1-dev am:
1e5152b539 -s ours am:
b32be39c6d -s ours
am:
a162265529 -s ours
Change-Id: I81f7ba17a82d9b58b62d0060f02da672e04cb6cf
TreeHugger Robot [Fri, 13 Jul 2018 16:54:43 +0000 (16:54 +0000)]
Merge "NotificationPlayer: release MediaPlayer on error and exception"
Bernie Innocenti [Fri, 13 Jul 2018 16:42:28 +0000 (09:42 -0700)]
[automerger skipped] Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-dev am:
8f1c70e49b am:
d1f53d13a9 -s ours
am:
213af1a79e -s ours
Change-Id: If0154030422d4ddd2b4383f9e107125d67f7b409
Treehugger Robot [Fri, 13 Jul 2018 16:34:30 +0000 (16:34 +0000)]
Merge "Revert "Update SubscriptionInfo o use strings for mccmnc""
Bernie Innocenti [Fri, 13 Jul 2018 16:28:39 +0000 (09:28 -0700)]
[automerger skipped] Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-mr1-dev am:
1e5152b539 -s ours
am:
b32be39c6d -s ours
Change-Id: Ia1dfd55946842083d4e3256a51607cecf59a67b8
Bernie Innocenti [Fri, 13 Jul 2018 16:28:11 +0000 (09:28 -0700)]
[automerger skipped] Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-dev am:
8f1c70e49b
am:
d1f53d13a9 -s ours
Change-Id: I293fc38d50e75b0b021dff6af045ac8a2aa6927f
Bernie Innocenti [Fri, 13 Jul 2018 16:17:40 +0000 (09:17 -0700)]
Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-dev
am:
8f1c70e49b
Change-Id: Ic103dfa909ca4567a815b16f0794baf74c1cf068
Bernie Innocenti [Fri, 13 Jul 2018 16:17:17 +0000 (09:17 -0700)]
[automerger skipped] Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-mr1-dev
am:
1e5152b539 -s ours
Change-Id: I2ada9a973b1728122a2beb5f47d105af4507c742
TreeHugger Robot [Fri, 13 Jul 2018 16:05:32 +0000 (16:05 +0000)]
Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-dev
TreeHugger Robot [Fri, 13 Jul 2018 16:05:27 +0000 (16:05 +0000)]
Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-mr1-dev
TreeHugger Robot [Fri, 13 Jul 2018 15:47:19 +0000 (15:47 +0000)]
Merge "Pin compiled code of HOME app"
Philip P. Moltmann [Fri, 13 Jul 2018 15:35:39 +0000 (15:35 +0000)]
Merge "Allow ignoring return values when checking if class is mockable"
TreeHugger Robot [Fri, 13 Jul 2018 15:10:50 +0000 (15:10 +0000)]
Merge "Fixed auto-brightness first screen update."
Tony Mak [Fri, 13 Jul 2018 14:59:29 +0000 (15:59 +0100)]
Ignore notification from other users
This fixed the issue that both personal and work NAS try to suggest
adjustment to work notifications. And if the personal one wins, tapping
on smart actions in work notification will bring up personal app.
BUG:
110527159
Test: Send a message to work profile hangouts. Click on the smart action,
work app is launched.
Change-Id: I7021de43c10c8ff3abab455b1d58384661b99a76
Brad Stenning [Fri, 22 Jun 2018 22:01:11 +0000 (15:01 -0700)]
Add an assist mic to the navigation bar
I also updated the notification hook to use the new NotifcationCenter
Bug:
110275838
Test: on dev device and in car
Change-Id: I28d42f6d37226028602fea4ac4d8901ba587a1ce
(cherry picked from commit
4691a983e2c4aaea68c4b642cca788c0933a5e12)
Brad Stenning [Fri, 13 Jul 2018 14:43:35 +0000 (14:43 +0000)]
Merge "Move values out of car_product to the new CarSystemUI"
Julia Reynolds [Fri, 13 Jul 2018 14:17:07 +0000 (14:17 +0000)]
Merge "Add notification settings to backup&restore"
Dan Gittik [Fri, 13 Jul 2018 14:10:39 +0000 (15:10 +0100)]
Fixed auto-brightness first screen update.
When auto-brightness is enabled, it should update the screen as soon
as ALS data is available; however, if that data results in the same
screen brightness as before, this update is optimised away, even
though it should be applied (in case the actual screen brightness
did change, e.g. by a user who turned adaptive brightness off).
Test: Turn adaptive brightness off; set the screen brightness to 0;
turn adaptive brightness on again (do so several times).
Before the fix, it would often take a while for the screen
to brighten (because similar ALS data results in the same
screen brightness as before, an thus no update is issued).
After the fix, it should brighten immediately.
Fixes:
111381286
Change-Id: I4b6fa2b0efc77e8d01aa10274e9cc33ca8ad583d
Bernie Innocenti [Fri, 13 Jul 2018 13:38:01 +0000 (06:38 -0700)]
[automerger skipped] Merge "vpn: allow IPSec traffic through Always-on VPN" into pi-dev am:
903d59735e -s ours
am:
cf164db36f -s ours
Change-Id: I6b12b39093e3777994c3f074ec1de5294f967487
Bernie Innocenti [Fri, 13 Jul 2018 13:30:01 +0000 (06:30 -0700)]
[automerger skipped] Merge "vpn: allow IPSec traffic through Always-on VPN" into pi-dev
am:
903d59735e -s ours
Change-Id: I459cc0215436f5fb1266a9053404487ac1cbd1f4
TreeHugger Robot [Fri, 13 Jul 2018 13:19:48 +0000 (13:19 +0000)]
Merge "vpn: allow IPSec traffic through Always-on VPN" into pi-dev
Jorim Jaggi [Mon, 9 Jul 2018 15:57:10 +0000 (17:57 +0200)]
Pin compiled code of HOME app
Keeping the code in memory of the currently set home app is
important for latency as we don't have any kind of starting
window/splash screen when pressing the home app to hide any latency.
Memory impact:
Pinning dex/vdex:
In practical scenarios, this should be < 500kb.
The home app is usually profile-speed compiled, for which the
resulting dex/vdex files are about 2 mb. However, during regular
use, at least 1.5 MB of it is referenced in memory. This makes
sense: By definition profile-speed only compiles the things that
is usually frequently executed during regular execution.
Pinning apk:
With Launcher 3 in practical scenarios this should be about 3.7 MB,
as the APK is about 5.7 MB but 2 MB are usually referenced in any
case.
Bug:
111132016
Bug:
78585335
Test: Inspect "adb shell dumpsys pinner" after boot.
Test: Check for pinned files after updating camera/home.
Test: Check for pinned files after user switch with different
default apps.
Test: Check for pinned files after bg-dexopt.
Test: Check for pinned files after bg-dexopt + kill pid.
Change-Id: I6cdbc06d089efeb1c72a51216879ba0573502009
Tony Mak [Fri, 13 Jul 2018 12:48:53 +0000 (13:48 +0100)]
Fix smart action is not enabled in first whatsapp notification
When there is only one incoming message, whatsapp neither set
category as msg nor use MessageStyle. To fix this, we add one more
heuristic. If a notification has inline reply, we consider it as a
message notification.
BUG:
110527159
Test: Send myself a whatsapp notification. Observe that smart action is
added.
Change-Id: I2854764dce4eadd4b785d43f3042499607b2e8bf
Yueming Wang [Fri, 13 Jul 2018 10:29:43 +0000 (10:29 +0000)]
Revert "Update SubscriptionInfo o use strings for mccmnc"
This reverts commit
0c149bd2d84d6e7c21dd4d7fff1e4dcfd51318f3.
Reason for revert: reverting this topic as it breaks several branches.
Change-Id: Ia01984242e54b5db5d853135b322ebb1284a4d43
Merged-In: I45c0bfefb7ffe98e3eab8e68d0e1170881ae9f4c
Bill Yi [Fri, 13 Jul 2018 11:12:01 +0000 (04:12 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I123ada1f5523bb94ee1b7df86889f557566256cd
Bill Yi [Fri, 13 Jul 2018 11:04:51 +0000 (04:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I212472dabb6d559ca052e36011d94b6535b1effd
Auto-generated-cl: translation import
Baisheng Zheng [Fri, 13 Jul 2018 04:45:32 +0000 (04:45 +0000)]
Merge "Remove not-required assertion in BluetoothTestUtils.disable/enable"
Dan Shi [Fri, 13 Jul 2018 04:32:14 +0000 (04:32 +0000)]
Merge "Add tests in gce-presubmit-wm.gcl and gce-postsubmit-wm.gcl to TEST_MAPPING"
TreeHugger Robot [Fri, 13 Jul 2018 03:38:16 +0000 (03:38 +0000)]
Merge "Skip execution of transactions on a destroyed activity"
Jack Yu [Thu, 12 Jul 2018 22:10:34 +0000 (15:10 -0700)]
DO NOT MERGE - Revert "Hide IWLAN system API"
This reverts commit
ea440a765e2774320910073e5350bdccd39afb6c, reversing
changes made to
0b90c524cb8288f3b8d8111b5724c02630c5b4c6.
Test: Build
Bug:
73659459
Change-Id: Id5a5147c6478cf10661aebe52b445bd16195885e
Lucas Dupin [Fri, 13 Jul 2018 02:09:31 +0000 (02:09 +0000)]
Merge "Dark Notification Shade"
TreeHugger Robot [Fri, 13 Jul 2018 02:05:29 +0000 (02:05 +0000)]
Merge "GiveSystemAudioModeStatus handler and test."
Lucas Dupin [Fri, 13 Jul 2018 01:42:53 +0000 (18:42 -0700)]
Activate night mode when battery saver
This as originally in SysUI but UiModeManagerService is cleaner way
of doing it. This way SysUI won't have to keep track of user preferences
or override user settings.
Test: manually toggle battery saver and observe QS
Bug:
104205224
Change-Id: Ic0d24e36eec2ad3b66b32960bfc5e659470044b1
Evan Laird [Fri, 13 Jul 2018 01:29:53 +0000 (18:29 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Use minimumHeight in QS header" into pi-dev am:
090e9d232c
am:
67a6e07ed3 -s ours
Change-Id: Ie751d707232446d896501a3eeb19b65fc6806ca6
TreeHugger Robot [Fri, 13 Jul 2018 01:09:39 +0000 (01:09 +0000)]
Merge "Take a context to start setting intent in DreamBackend"
TreeHugger Robot [Fri, 13 Jul 2018 01:08:01 +0000 (01:08 +0000)]
Merge "MediaPlayer2: skip commands when in error state"
TreeHugger Robot [Fri, 13 Jul 2018 00:56:29 +0000 (00:56 +0000)]
Merge "Fix a few issues with procstats associations:"
Evan Laird [Fri, 13 Jul 2018 00:54:51 +0000 (17:54 -0700)]
Merge "DO NOT MERGE: Use minimumHeight in QS header" into pi-dev
am:
090e9d232c
Change-Id: Ifdd605c54262b533b405a6161b7b857609d576bc
Android Build Merger (Role) [Fri, 13 Jul 2018 00:47:52 +0000 (00:47 +0000)]
Merge "[automerger skipped] Merge "Update SubscriptionInfo o use strings for mccmnc" am:
0babf1815c am:
08a4eb9445 am:
2656f6d049 -s ours"
Hall Liu [Fri, 13 Jul 2018 00:46:03 +0000 (17:46 -0700)]
[automerger skipped] Merge "Update SubscriptionInfo o use strings for mccmnc" am:
0babf1815c am:
08a4eb9445
am:
2656f6d049 -s ours
Change-Id: I8be5c1a12aec361c9a119092332c4ee23ee4e9e2
Android Build Merger (Role) [Fri, 13 Jul 2018 00:39:51 +0000 (00:39 +0000)]
Merge "Merge "Audio assets: add NFC sounds" am:
5cb7cd68a0 am:
8df8455384 am:
db864758c0"
Jean-Michel Trivi [Fri, 13 Jul 2018 00:39:15 +0000 (17:39 -0700)]
Merge "Audio assets: add NFC sounds" am:
5cb7cd68a0 am:
8df8455384
am:
db864758c0
Change-Id: I7dd9a054f1046ac1e2c21cebb8b69dc04ea452bb
TreeHugger Robot [Fri, 13 Jul 2018 00:34:23 +0000 (00:34 +0000)]
Merge "WM: Fix broken layout hint calculation"
Lucas Dupin [Mon, 25 Jun 2018 23:21:13 +0000 (16:21 -0700)]
Dark Notification Shade
Test: adb shell service call uimode 4 i32 1 # day
Test: adb shell service call uimode 4 i32 2 # night
Bug:
110758454
Change-Id: Ib6fce91d1aeff7e1fbfe8a7a528095487fbdb3f8
Jack Yu [Fri, 13 Jul 2018 00:29:49 +0000 (17:29 -0700)]
[automerger skipped] Merge "Revert "Added documentation for network registration state"" am:
1cbcc50d0a -s ours am:
2016ffc9ec
am:
153f5a7eb9
Change-Id: I4f0541719df01f341c32b2e5a85d5b640fbe162e
TreeHugger Robot [Fri, 13 Jul 2018 00:19:23 +0000 (00:19 +0000)]
Merge "Grant split permissions if root permission is granted"
Tomasz Wasilczyk [Fri, 13 Jul 2018 00:04:32 +0000 (00:04 +0000)]
Merge "Export BandDescriptor for AIDL."
TreeHugger Robot [Thu, 12 Jul 2018 23:34:50 +0000 (23:34 +0000)]
Merge "DO NOT MERGE: Use minimumHeight in QS header" into pi-dev
Jorim Jaggi [Thu, 12 Jul 2018 23:14:10 +0000 (16:14 -0700)]
[automerger skipped] Merge "DO NOT MERGE Remove WTF spam" into pi-dev am:
650ead619e
am:
bdc73423c6 -s ours
Change-Id: I82b11d019dce0127cce0178f356cd83a4ef39046
Winson Chung [Thu, 12 Jul 2018 23:12:23 +0000 (16:12 -0700)]
[automerger skipped] Merge "Acquire service lock in AppTaskImpl.moveToFront()" into pi-dev am:
7775af2778
am:
684eb30cb4 -s ours
Change-Id: I860033381de790bc76a587c8cda34666214681a0
Hall Liu [Thu, 12 Jul 2018 23:07:43 +0000 (16:07 -0700)]
Merge "Update SubscriptionInfo o use strings for mccmnc" am:
0babf1815c
am:
08a4eb9445
Change-Id: I0462d1de1c2622499470b00195897ce370a13020
Jean-Michel Trivi [Thu, 12 Jul 2018 22:59:41 +0000 (15:59 -0700)]
Merge "Audio assets: add NFC sounds" am:
5cb7cd68a0
am:
8df8455384
Change-Id: I11d6eba4ca5e888e71e91fdef2d7dd8383391ec8
Bill Yi [Thu, 12 Jul 2018 22:57:59 +0000 (15:57 -0700)]
Merge changes from topic "am-
9f47cb6c-9cea-4b25-9f9b-
e0e460e471ac" into oc-dev am:
71bd839856 am:
262d6935a0 am:
d9bd9d1c04 am:
4ab42d5b8a
am:
387f121e26
Change-Id: If5410e44a19cd119b31401a6aa47025ebc24bca1
Jack Yu [Thu, 12 Jul 2018 22:52:35 +0000 (15:52 -0700)]
[automerger skipped] Merge "Revert "Added documentation for network registration state"" am:
1cbcc50d0a -s ours
am:
2016ffc9ec
Change-Id: I037d2b66b69b9a968a076888fcd74b178448809b
Dianne Hackborn [Thu, 12 Jul 2018 21:51:54 +0000 (14:51 -0700)]
Fix a few issues with procstats associations:
- Use the correct state when comparing the association
with the process. (Was causing warning spam as well.)
- Don't wtf if we call startAssociationIfNeeded() no a
ServiceRecord that doesn't have a process... that is normal
when first bringing up a service.
Also add a switch to turn this all off, which for now is
leaving it on.
Test: manual
Bug:
111391911
Bug:
111302807
Bug:
111131998
Change-Id: I2d3f43fd99c7ade24c867ad80a728d898ab0e6c5
Bill Yi [Thu, 12 Jul 2018 22:45:06 +0000 (15:45 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4037fb69e skipped:
741c97faa9 am:
0c31d81cd1 -s ours am:
afb05522f1 -s ours am:
f85971f3a2 -s ours am:
698e7ebb0b -s ours
am:
4b53224b3b -s ours
Change-Id: I9853b4496e0e67d8163aba5a6e137bdaad019663
Dan Shi [Thu, 12 Jul 2018 22:39:51 +0000 (22:39 +0000)]
Merge "Add tests in gce-presubmit-am.gcl and gce-postsubmit-am.gcl to TEST_MAPPING"
Brad Stenning [Tue, 19 Jun 2018 22:03:46 +0000 (15:03 -0700)]
Move values out of car_product to the new CarSystemUI
Bug:
110275838
Change-Id: Ica7a3bd2e1661954398010e5eff150dea20a3bd5
Test: on 2 emulators and 2 hardware versions
(cherry picked from commit
d879e7e0f5c13409f13c58ec88376ec807a691cc)
Hall Liu [Thu, 12 Jul 2018 22:22:52 +0000 (15:22 -0700)]
Merge "Update SubscriptionInfo o use strings for mccmnc"
am:
0babf1815c
Change-Id: I1833cb2d5437cccb61cc8f6dcd884a45a2b3250f
Amy [Thu, 7 Jun 2018 00:56:39 +0000 (17:56 -0700)]
GiveSystemAudioModeStatus handler and test.
Test: atest com.android.server.hdmi
Change-Id: I8c744044fee9d7330475c3bbd8f97f59628731d2
(cherry picked from commit
0f86ea93f72f02c81e1643e025ea2280305e65b8)
TreeHugger Robot [Thu, 12 Jul 2018 22:15:41 +0000 (22:15 +0000)]
Merge "GiveAudioStatusHandler and test."
Jorim Jaggi [Thu, 12 Jul 2018 22:09:20 +0000 (15:09 -0700)]
Merge "DO NOT MERGE Remove WTF spam" into pi-dev
am:
650ead619e
Change-Id: I6d4300530516c25a5eb9af8ea8f924591eff3b95
Philip P. Moltmann [Thu, 12 Jul 2018 16:51:02 +0000 (09:51 -0700)]
Grant split permissions if root permission is granted
- In the case of an upgrade
- When granting default permissions
Change-Id: I604223a00cbb9350718c6a293f979d5ce99e12c9
Fixes:
111325117
Test: Looked at location permissions after upgrade and after fresh install
Wei Jia [Thu, 12 Jul 2018 00:20:02 +0000 (17:20 -0700)]
MediaPlayer2: skip commands when in error state
Test: cts
Bug:
109928575
Change-Id: I1b2d4a2336e09856ed4ffba15f8c47577101c4b5
Tomasz Wasilczyk [Thu, 12 Jul 2018 20:53:57 +0000 (13:53 -0700)]
Export BandDescriptor for AIDL.
Bug:
73950974
Test: it builds
Change-Id: I96321c24c96a848ab01cca47f563d70e4ff99b89
Winson Chung [Thu, 12 Jul 2018 21:46:31 +0000 (14:46 -0700)]
Merge "Acquire service lock in AppTaskImpl.moveToFront()" into pi-dev
am:
7775af2778
Change-Id: I54d224436509531cfd0e33cce97d8471c0867447