OSDN Git Service
TreeHugger Robot [Fri, 13 Jul 2018 16:54:43 +0000 (16:54 +0000)]
Merge "NotificationPlayer: release MediaPlayer on error and exception"
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."
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
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"
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."
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
Jean-Michel Trivi [Thu, 12 Jul 2018 21:36:35 +0000 (14:36 -0700)]
Merge "Audio assets: add NFC sounds"
am:
5cb7cd68a0
Change-Id: I84755ad470a4826879cd6c148c9a041bce6a7920
Jorim Jaggi [Thu, 12 Jul 2018 21:32:53 +0000 (21:32 +0000)]
Merge "DO NOT MERGE Remove WTF spam" into pi-dev
Bill Yi [Thu, 12 Jul 2018 21:31:15 +0000 (14:31 -0700)]
Merge changes from topic "am-
9f47cb6c-9cea-4b25-9f9b-
e0e460e471ac" into oc-dev am:
71bd839856 am:
262d6935a0 am:
d9bd9d1c04
am:
4ab42d5b8a
Change-Id: I5afb90731ccdc2afc1df7c9ac45f9efaa0820ac5
Brad Stenning [Thu, 12 Jul 2018 21:30:45 +0000 (21:30 +0000)]
Merge "Initial include of the CarSystemUI package"
Bill Yi [Thu, 12 Jul 2018 21:16:01 +0000 (14:16 -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
Change-Id: I005a54804323515e99552fc4bde76bc079d78f35
Hall Liu [Thu, 12 Jul 2018 21:13:16 +0000 (21:13 +0000)]
Merge "Update SubscriptionInfo o use strings for mccmnc"
Bill Yi [Thu, 12 Jul 2018 21:07:31 +0000 (14:07 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e059d5fb83 skipped:
e97378c657 am:
9935787f3b -s ours am:
bf789ba0d1 -s ours am:
847b7d112e -s ours am:
5bf0d3e61c -s ours
am:
d66d01c85e -s ours
Change-Id: I082401505cbd0d9550602765a0611a20770566f8
Nathan Harold [Thu, 12 Jul 2018 21:04:52 +0000 (14:04 -0700)]
Merge "Remove Duplicate Override for Operator Alphas" am:
24eaa6ab3d am:
f5f908c525
am:
fe1b6deb66
Change-Id: I0f0525480e9d28142cb5ee375f834a21e6121f31
Bill Yi [Thu, 12 Jul 2018 20:57:24 +0000 (13:57 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e059d5fb83 skipped:
e97378c657 am:
9935787f3b -s ours am:
bf789ba0d1 -s ours am:
847b7d112e -s ours
am:
5bf0d3e61c -s ours
Change-Id: I1ee3b8540dec46bdd7e9539b469567f498ddd68f
Amy [Wed, 6 Jun 2018 00:31:55 +0000 (17:31 -0700)]
GiveAudioStatusHandler and test.
Test: atest com.android.server.hdmi
Change-Id: I402d3b783783bf9d79f3b7de55fb7a26f6c10be2
(cherry picked from commit
403a500216047e04fa8aebe8b24d4e3d89d28898)
Jack Yu [Thu, 12 Jul 2018 20:52:49 +0000 (13:52 -0700)]
[automerger skipped] Merge "Revert "Added documentation for network registration state""
am:
1cbcc50d0a -s ours
Change-Id: I02d1877b0bd5d84895ea12590c8ea0668e0255db
Sudheer Shanka [Thu, 12 Jul 2018 20:48:27 +0000 (20:48 +0000)]
Merge "Track time spent for computing oom_adj."
TreeHugger Robot [Thu, 12 Jul 2018 20:47:34 +0000 (20:47 +0000)]
Merge "Add stub handlers for audio system device."
Winson Chung [Thu, 12 Jul 2018 20:46:44 +0000 (20:46 +0000)]
Merge "Acquire service lock in AppTaskImpl.moveToFront()" into pi-dev
Bill Yi [Thu, 12 Jul 2018 20:37:57 +0000 (13:37 -0700)]
Merge changes from topic "am-
9f47cb6c-9cea-4b25-9f9b-
e0e460e471ac" into oc-dev am:
71bd839856 am:
262d6935a0
am:
d9bd9d1c04
Change-Id: Id7b15870681b4971920a36db92198bb32d92ef51
TreeHugger Robot [Thu, 12 Jul 2018 20:31:25 +0000 (20:31 +0000)]
Merge "Make IAutofillManager fully oneway."
Evan Laird [Mon, 2 Jul 2018 21:43:59 +0000 (17:43 -0400)]
DO NOT MERGE: Use minimumHeight in QS header
Allow QuickStatusBarHeader to use a minimum hieight so that it doesn't
draw underneath of a notch when display densities are low.
Bug:
78110564
Test: visual
Change-Id: I44df89c3b98dc0bdb8455b36e7ad023b92676c9d
Bill Yi [Thu, 12 Jul 2018 20:27:05 +0000 (13:27 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4037fb69e skipped:
741c97faa9 am:
0c31d81cd1 -s ours am:
afb05522f1 -s ours
am:
f85971f3a2 -s ours
Change-Id: I0891178936b34370816eb9c15fd4103ecee586cc
Nathan Harold [Thu, 12 Jul 2018 20:26:41 +0000 (13:26 -0700)]
Merge "Remove Duplicate Override for Operator Alphas" am:
24eaa6ab3d
am:
f5f908c525
Change-Id: I9fe744ec118df8e68616d72f2c26db612b2b49a0
Bill Yi [Thu, 12 Jul 2018 20:24:55 +0000 (13:24 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e059d5fb83 skipped:
e97378c657 am:
9935787f3b -s ours am:
bf789ba0d1 -s ours
am:
847b7d112e -s ours
Change-Id: I236fce4894fa4dda79e34ed191560598dcd2a4c4
TreeHugger Robot [Thu, 12 Jul 2018 20:24:24 +0000 (20:24 +0000)]
Merge "Remove use of SkRefCnt_SafeAssign."
Fan Zhang [Thu, 12 Jul 2018 20:18:00 +0000 (13:18 -0700)]
Take a context to start setting intent in DreamBackend
Change-Id: I76d3751c950b1af9065d58b3b740736b3432606d
Fixes:
111375261
Test: rebuild
Bill Yi [Thu, 12 Jul 2018 20:17:45 +0000 (13:17 -0700)]
Merge changes from topic "am-
9f47cb6c-9cea-4b25-9f9b-
e0e460e471ac" into oc-dev am:
71bd839856
am:
262d6935a0
Change-Id: Ic9027e92228853ab6dffacf72c0afc3920946d19
Bill Yi [Thu, 12 Jul 2018 20:10:22 +0000 (13:10 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4037fb69e skipped:
741c97faa9 am:
0c31d81cd1 -s ours
am:
afb05522f1 -s ours
Change-Id: I92e39d42756e8d5d7f517802ddbdc8e539024d88
Bill Yi [Thu, 12 Jul 2018 20:08:42 +0000 (13:08 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e059d5fb83 skipped:
e97378c657 am:
9935787f3b -s ours
am:
bf789ba0d1 -s ours
Change-Id: I157f816f170fc9af6263e552a46612fab2760f63
Bill Yi [Thu, 12 Jul 2018 19:47:58 +0000 (12:47 -0700)]
Merge changes from topic "am-
9f47cb6c-9cea-4b25-9f9b-
e0e460e471ac" into oc-dev
am:
71bd839856
Change-Id: Ic7c05906f4d2f9fecc9ab93ab90b9869d8b176be
Bill Yi [Thu, 12 Jul 2018 19:45:19 +0000 (12:45 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4037fb69e skipped:
741c97faa9
am:
0c31d81cd1 -s ours
Change-Id: I404ba441a96f77be638d89c0c43f950200a94376
Jean-Michel Trivi [Thu, 12 Jul 2018 19:41:51 +0000 (19:41 +0000)]
Merge "Audio assets: add NFC sounds"
Bill Yi [Thu, 12 Jul 2018 19:41:11 +0000 (12:41 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e059d5fb83 skipped:
e97378c657
am:
9935787f3b -s ours
Change-Id: I1ef782ee8a7ed8da6baed44c052f1fa3a08c1af4
Nathan Harold [Thu, 12 Jul 2018 19:35:18 +0000 (12:35 -0700)]
Merge "Remove Duplicate Override for Operator Alphas"
am:
24eaa6ab3d
Change-Id: I15004a7df3d922ba50d187769299723e888febae
TreeHugger Robot [Thu, 12 Jul 2018 19:34:40 +0000 (19:34 +0000)]
Merge "Depecrate flags, and try to match them to actions"
TreeHugger Robot [Thu, 12 Jul 2018 19:26:31 +0000 (19:26 +0000)]
Merge changes from topic "am-
9f47cb6c-9cea-4b25-9f9b-
e0e460e471ac" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4037fb69e skipped:
741c97faa9
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4037fb69e
Import translations. DO NOT MERGE
Ben Wagner [Thu, 12 Jul 2018 16:41:28 +0000 (12:41 -0400)]
Remove use of SkRefCnt_SafeAssign.
Update pointer to SkRefCnt fields which require it to sk_sp.
Test: refactoring CL. Existing unit tests still pass.
Change-Id: I4f3eb790ee67c09746708458c4492569b64cc58f
Jordan Liu [Thu, 12 Jul 2018 19:16:41 +0000 (12:16 -0700)]
Merge "WRITE_APN_SETTINGS is also required to read" am:
0beefc0af5 am:
e5c77fc978
am:
4af8f3c3bf
Change-Id: I032f399674847edf7698ad13d5914e33a0df70d1
Neil Fuller [Thu, 12 Jul 2018 19:00:24 +0000 (12:00 -0700)]
[automerger skipped] Merge "Move XML object factory logic to libcore" am:
8176fb99e1 am:
7add22db60
am:
a57acd367c -s ours
Change-Id: I7084ce472a2fce76048b02fe7f0c1672428bd207
Dan Shi [Tue, 10 Jul 2018 17:36:35 +0000 (10:36 -0700)]
Add tests in gce-presubmit-wm.gcl and gce-postsubmit-wm.gcl to TEST_MAPPING
Bug:
111302567
Test: local run "atest", "atest :postsubmit"
Change-Id: I655f2bb987a3c3bf244b6e166cfb72a5b15c77c7
Jordan Liu [Thu, 12 Jul 2018 18:56:50 +0000 (11:56 -0700)]
Merge "WRITE_APN_SETTINGS is also required to read" am:
0beefc0af5
am:
e5c77fc978
Change-Id: I42a6e604ff65bbb77d0f23c584722c1ea44038e6
Dan Shi [Tue, 10 Jul 2018 05:18:08 +0000 (22:18 -0700)]
Add tests in gce-presubmit-am.gcl and gce-postsubmit-am.gcl to TEST_MAPPING
Bug:
111302567
Test: local run atest
veried in TH: tests/
a4174ff9-e417-479d-8ca5-
8431d6adeed8
Change-Id: I9ecc5c9c209b9d2728f9f7ed5d298867905555f3
Jack Yu [Thu, 12 Jul 2018 18:49:31 +0000 (11:49 -0700)]
[automerger skipped] Merge "Added documentation for network registration state" am:
c51397b161 -s ours am:
6af5ddcc4a
am:
e0cb240a50
Change-Id: I9de375d4da8c612bfa09c947c652edc1c2c28722
Jordan Liu [Thu, 12 Jul 2018 18:46:32 +0000 (11:46 -0700)]
Merge "WRITE_APN_SETTINGS is also required to read"
am:
0beefc0af5
Change-Id: I1ac69c71c7bdb39a9631da00a8bda89f7c1f0edd
Neil Fuller [Thu, 12 Jul 2018 18:42:14 +0000 (11:42 -0700)]
Merge "Move XML object factory logic to libcore" am:
8176fb99e1
am:
7add22db60
Change-Id: If395891203fae0a8b55f8f58430adc979b758db2
Jack Yu [Thu, 12 Jul 2018 18:35:03 +0000 (11:35 -0700)]
[automerger skipped] Merge "Added documentation for network registration state" am:
c51397b161 -s ours
am:
6af5ddcc4a
Change-Id: I7ea119e9f8d580e18efa56f1cfa3be4c86c18bea
chened [Thu, 12 Jul 2018 18:33:30 +0000 (11:33 -0700)]
Merge "Camera: Use session configuraion when recording tests" into pi-dev am:
26da9f18ed
am:
c6360e5772
Change-Id: I7667526285406451cea841dba22d265163c95354
Neil Fuller [Thu, 12 Jul 2018 18:26:03 +0000 (11:26 -0700)]
Merge "Move XML object factory logic to libcore"
am:
8176fb99e1
Change-Id: Ib0940ecb89eaf11841bbd66cdaf1c5379466496c
Jack Yu [Thu, 12 Jul 2018 18:21:11 +0000 (11:21 -0700)]
[automerger skipped] Merge "Added documentation for network registration state"
am:
c51397b161 -s ours
Change-Id: I33f775c099c949f117badea85fadaa3e5a2eec7a
Donghui Han [Thu, 12 Jul 2018 18:19:07 +0000 (11:19 -0700)]
Merge "camera2: Treat face detect mode larger than FULL as FULL" into pi-dev am:
2fca393cc1
am:
d05d630060
Change-Id: I3947264d88d0c558f8c7fb5ee22160af934e411e
Jack Yu [Thu, 12 Jul 2018 18:16:26 +0000 (18:16 +0000)]
Merge "Revert "Added documentation for network registration state""
Nathan Harold [Thu, 12 Jul 2018 18:08:05 +0000 (18:08 +0000)]
Merge "Remove Duplicate Override for Operator Alphas"
Wale Ogunwale [Wed, 11 Jul 2018 22:22:01 +0000 (15:22 -0700)]
Acquire service lock in AppTaskImpl.moveToFront()
Oversight from previous refactor in O release done in ag/
2987716
Change-Id: I2e2d6e55251eb319ddee0db97eedc1c574736ead
Merged-In: I2e2d6e55251eb319ddee0db97eedc1c574736ead
Fixes:
111336376
Test: builds
chened [Thu, 12 Jul 2018 17:53:26 +0000 (10:53 -0700)]
Merge "Camera: Use session configuraion when recording tests" into pi-dev
am:
26da9f18ed
Change-Id: I68975212f84e6e31c2dffb002749d2ec735689b5
Sudheer Shanka [Thu, 12 Jul 2018 17:30:38 +0000 (10:30 -0700)]
Track time spent for computing oom_adj.
Fixes:
111396442
Test: manual
Change-Id: I5d6877a149920ba764d7a2c90806ae7e45db5aac
OSDN Git Service
