OSDN Git Service
Jordan Liu [Sat, 10 Mar 2018 02:38:10 +0000 (02:38 +0000)]
Merge "Fix mLteSignalStrength range check" am:
fbf9d61bb2
am:
9b11677ae8
Change-Id: Ia64b3c13a22bf66557db26ae42f162c989abb5af
Marco Nelissen [Sat, 10 Mar 2018 02:28:49 +0000 (02:28 +0000)]
Merge "Rework thumbnail cleanup" into oc-mr1-dev am:
b20a329f4c
am:
6db0f4dac8
Change-Id: I4f834d6c91255e7a59f608d8f28972ecfb8619fe
Jordan Liu [Sat, 10 Mar 2018 02:24:09 +0000 (02:24 +0000)]
Merge "Fix mLteSignalStrength range check"
am:
fbf9d61bb2
Change-Id: I6066b9f08d88dd8102761c219a02a24b06c24b47
Alan Viverette [Sat, 10 Mar 2018 02:20:56 +0000 (02:20 +0000)]
Merge changes from topic "viewpager_state" into oc-dev am:
77edd5fabe am:
5811482acf am:
ad3035353d -s ours
am:
c4ee36b84f -s ours
Change-Id: I2112ec496edec3504b67693b2cae99a068342f12
Makoto Onuki [Sat, 10 Mar 2018 02:01:13 +0000 (02:01 +0000)]
Merge "Fix min handling in AbsSeekBar" into pi-dev
am:
87030d72b0
Change-Id: I8462f28029f16c514ccd456416474a5bedc7e78d
Jeff Vander Stoep [Sat, 10 Mar 2018 01:51:16 +0000 (01:51 +0000)]
Merge "Check for null pkgList in fixSeInfoLocked()" into pi-dev
am:
9c1b415a20
Change-Id: I1f1363e1237a13373b25fd804ec5cbdddae11c55
Android Build Merger (Role) [Sat, 10 Mar 2018 01:05:38 +0000 (01:05 +0000)]
Merge "Merge "Removing EXPLICT tag from Batterystats metric names." into pi-dev am:
9d06b10205" into pi-dev-plus-aosp
Kweku Adams [Sat, 10 Mar 2018 01:04:43 +0000 (01:04 +0000)]
Merge "Removing EXPLICT tag from Batterystats metric names." into pi-dev
am:
9d06b10205
Change-Id: I9f6d49f346122ab8fa30ae8fd6d612c8c028bfd6
Android Build Merger (Role) [Sat, 10 Mar 2018 00:52:32 +0000 (00:52 +0000)]
Merge "Merge changes from topic "recognition_service-mnc-dev" into oc-dev am:
714fb7ae84 am:
7915ba5c9f am:
7213adbb7f am:
bbf4a9df62" into pi-dev-plus-aosp
Eugene Susla [Sat, 10 Mar 2018 00:52:04 +0000 (00:52 +0000)]
Merge changes from topic "recognition_service-mnc-dev" into oc-dev am:
714fb7ae84 am:
7915ba5c9f am:
7213adbb7f
am:
bbf4a9df62
Change-Id: I0b0307f7e7fb774a98b1e3087206b101c1596f5b
Treehugger Robot [Sat, 10 Mar 2018 00:40:19 +0000 (00:40 +0000)]
Merge "Fix mLteSignalStrength range check"
Android Build Merger (Role) [Sat, 10 Mar 2018 00:38:51 +0000 (00:38 +0000)]
Merge "Merge "Convert api-stubs, system-api-stubs, and test-api-stubs target" am:
baa37dbbad am:
5a4b586e28" into pi-dev-plus-aosp
Nan Zhang [Sat, 10 Mar 2018 00:38:00 +0000 (00:38 +0000)]
Merge "Convert api-stubs, system-api-stubs, and test-api-stubs target" am:
baa37dbbad
am:
5a4b586e28
Change-Id: I880168e468e06a0351ad9e084e108cd46f8ca1d3
Android Build Merger (Role) [Sat, 10 Mar 2018 00:36:02 +0000 (00:36 +0000)]
Merge "Merge "Fix AutoTileManagerTest" into pi-dev am:
c7a25dc939" into pi-dev-plus-aosp
Amin Shaikh [Sat, 10 Mar 2018 00:35:32 +0000 (00:35 +0000)]
Merge "Fix AutoTileManagerTest" into pi-dev
am:
c7a25dc939
Change-Id: I6c6639e80a65ba49bfed31512b739487ae0a42f4
Android Build Merger (Role) [Sat, 10 Mar 2018 00:30:31 +0000 (00:30 +0000)]
Merge "Merge "Defer deleting a http cache" am:
c294af5f94 am:
1aeed34905" into pi-dev-plus-aosp
Chris Tate [Sat, 10 Mar 2018 00:30:05 +0000 (00:30 +0000)]
Merge "Defer deleting a http cache" am:
c294af5f94
am:
1aeed34905
Change-Id: I69a34d1e9662fd46574fe75a76fa7eb1b92ba055
Android Build Merger (Role) [Sat, 10 Mar 2018 00:29:47 +0000 (00:29 +0000)]
Merge "Merge "Update battery saver colors to make them more obvious" into pi-dev am:
3dc91c1426" into pi-dev-plus-aosp
Evan Laird [Sat, 10 Mar 2018 00:29:20 +0000 (00:29 +0000)]
Merge "Update battery saver colors to make them more obvious" into pi-dev
am:
3dc91c1426
Change-Id: I88202e9d06e60f8862aa4b32c8df6c981a89c3f7
Android Build Merger (Role) [Sat, 10 Mar 2018 00:24:22 +0000 (00:24 +0000)]
Merge "Merge "Add known uses to hidden API light greylist" into pi-dev am:
9aefc4fce0" into pi-dev-plus-aosp
David Brazdil [Sat, 10 Mar 2018 00:23:58 +0000 (00:23 +0000)]
Merge "Add known uses to hidden API light greylist" into pi-dev
am:
9aefc4fce0
Change-Id: I01c9523ffda3d4f1c4fb441657c20f7d010395a0
Android Build Merger (Role) [Sat, 10 Mar 2018 00:18:44 +0000 (00:18 +0000)]
Merge "Merge "Update alarm and messaging dnd filtering" into pi-dev am:
0f6bcc9c4d" into pi-dev-plus-aosp
Julia Reynolds [Sat, 10 Mar 2018 00:18:23 +0000 (00:18 +0000)]
Merge "Update alarm and messaging dnd filtering" into pi-dev
am:
0f6bcc9c4d
Change-Id: I7594140746ba4c68602de4fb7c4ba208c3ed4887
Eric Schwarzenbach [Sat, 10 Mar 2018 00:17:06 +0000 (00:17 +0000)]
Merge "Add Duplex mode to ServiceState." am:
908bf936a5
am:
3bb160af29
Change-Id: I3b61a8c452989e7f80fc59f2c126b8b4abf2ad22
Nan Zhang [Sat, 10 Mar 2018 00:00:24 +0000 (00:00 +0000)]
Merge "Convert api-stubs, system-api-stubs, and test-api-stubs target"
am:
baa37dbbad
Change-Id: I20df7b673927fb1dce0b044d40198402797a5938
Chris Tate [Fri, 9 Mar 2018 23:53:30 +0000 (23:53 +0000)]
Merge "Defer deleting a http cache"
am:
c294af5f94
Change-Id: I29ef61d60774fc26596878d56455cc7a3c5e0236
David Brazdil [Fri, 9 Mar 2018 23:52:08 +0000 (23:52 +0000)]
Merge "Add PrintSpooler to system app whitelist" into pi-dev
am:
cb1a6fcf3b
Change-Id: Ia5c7fcc083fa8828d640e228a202ff01c0bc80d6
Eric Schwarzenbach [Fri, 9 Mar 2018 23:49:40 +0000 (23:49 +0000)]
Merge "Add Duplex mode to ServiceState."
am:
908bf936a5
Change-Id: Ied5fe88d7301ce3573be35c48101c25a6ccfea5c
Beverly [Fri, 9 Mar 2018 23:27:24 +0000 (23:27 +0000)]
Merge "Move notification policy log to ZenLog" into pi-dev
am:
44aa750f05
Change-Id: I7f44314fbfc16f881983915cdb52aa97b6dc5344
Marco Nelissen [Fri, 9 Mar 2018 23:00:20 +0000 (23:00 +0000)]
Merge "Rework thumbnail cleanup" into oc-mr1-dev
am:
b20a329f4c
Change-Id: I17b77312edb4fa03af1e89543ed5c27f4501d51c
Cassie Han [Fri, 9 Mar 2018 22:37:45 +0000 (22:37 +0000)]
Merge "Cherrypick "Add device config to decide which Auto Selection Network UI to use."" am:
fdbc592178
am:
0cd805a3c4
Change-Id: Idb5c597fefca66d67ce27ec9bd2ac3d02003b1f6
Jordan Liu [Fri, 9 Mar 2018 00:34:03 +0000 (16:34 -0800)]
Fix mLteSignalStrength range check
The previous check is wrong based on the spec, and does not match the
HAL definition either.
Change-Id: Idb1c209f11a76421d477f8a1d270e23d86d621b1
Fixes:
74026897
Test: manual
Treehugger Robot [Fri, 9 Mar 2018 22:33:27 +0000 (22:33 +0000)]
Merge "Convert api-stubs, system-api-stubs, and test-api-stubs target"
Alan Viverette [Fri, 9 Mar 2018 22:31:59 +0000 (22:31 +0000)]
Merge changes from topic "viewpager_state" into oc-dev am:
77edd5fabe am:
5811482acf
am:
ad3035353d -s ours
Change-Id: I3a9299aac572f54e45b36e11cb2b8d015b181739
Matthew Ng [Fri, 9 Mar 2018 22:27:06 +0000 (22:27 +0000)]
Merge "Add vibrate on down over nav bar and tick on motion up" into pi-dev
am:
25092e1d93
Change-Id: Iba49dbe9db30f83908d988a6ae67e18bdca42122
Cassie Han [Fri, 9 Mar 2018 22:26:34 +0000 (22:26 +0000)]
Merge "Cherrypick "Add device config to decide which Auto Selection Network UI to use.""
am:
fdbc592178
Change-Id: I2efd5b172f00d78f90333aa8168c52ae035a918d
Andreas Gampe [Fri, 9 Mar 2018 22:19:46 +0000 (22:19 +0000)]
Merge "PackageManager: Avoid null access" am:
9b8008e9e8
am:
ff4dd75b9f
Change-Id: I022dc4b09a0b14885a297c9dd25a5cf01b8a1e76
Makoto Onuki [Fri, 9 Mar 2018 21:59:16 +0000 (21:59 +0000)]
Merge "Fix min handling in AbsSeekBar" into pi-dev
Andreas Gampe [Fri, 9 Mar 2018 21:58:43 +0000 (21:58 +0000)]
Merge "PackageManager: Avoid null access"
am:
9b8008e9e8
Change-Id: Iabb496c276c250ed8edde6da0fe419925f5426e3
TreeHugger Robot [Fri, 9 Mar 2018 21:27:24 +0000 (21:27 +0000)]
Merge "Check for null pkgList in fixSeInfoLocked()" into pi-dev
Chris Tate [Fri, 9 Mar 2018 21:26:20 +0000 (21:26 +0000)]
Merge "Defer deleting a http cache"
Marco Nelissen [Fri, 9 Mar 2018 21:26:07 +0000 (21:26 +0000)]
Merge "Rework thumbnail cleanup" into oc-mr1-dev
Eric Schwarzenbach [Fri, 9 Mar 2018 21:19:10 +0000 (21:19 +0000)]
Merge "Add Duplex mode to ServiceState."
TreeHugger Robot [Fri, 9 Mar 2018 21:17:36 +0000 (21:17 +0000)]
Merge "Removing EXPLICT tag from Batterystats metric names." into pi-dev
Eugene Susla [Fri, 9 Mar 2018 21:14:21 +0000 (21:14 +0000)]
Merge changes from topic "recognition_service-mnc-dev" into oc-dev am:
714fb7ae84 am:
7915ba5c9f
am:
7213adbb7f
Change-Id: Id562b135ce25665b120e48a2c76d88587e48f125
Alan Viverette [Fri, 9 Mar 2018 20:49:36 +0000 (20:49 +0000)]
Merge changes from topic "viewpager_state" into oc-dev am:
77edd5fabe
am:
5811482acf
Change-Id: Ib6213f0f3b6a0247bbe33c0879a3179fb63eb35f
Cassie Han [Fri, 9 Mar 2018 20:29:41 +0000 (20:29 +0000)]
Merge "Cherrypick "Add device config to decide which Auto Selection Network UI to use.""
TreeHugger Robot [Fri, 9 Mar 2018 20:20:29 +0000 (20:20 +0000)]
Merge "Fix AutoTileManagerTest" into pi-dev
Alan Viverette [Fri, 9 Mar 2018 20:15:45 +0000 (20:15 +0000)]
Merge changes from topic "viewpager_state" into oc-dev
am:
77edd5fabe
Change-Id: Ic624154d57c8b7398d60c470bd285de35f2499af
Eugene Susla [Fri, 9 Mar 2018 20:09:02 +0000 (20:09 +0000)]
Merge changes from topic "recognition_service-mnc-dev" into oc-dev am:
714fb7ae84
am:
7915ba5c9f
Change-Id: Id938e5cd15852144fcce2367c4fac762f8cfc8ba
Treehugger Robot [Fri, 9 Mar 2018 20:06:24 +0000 (20:06 +0000)]
Merge "PackageManager: Avoid null access"
Android Build Merger (Role) [Fri, 9 Mar 2018 20:04:51 +0000 (20:04 +0000)]
Merge "Merge "Zygote: Set libbase default tag on fork" am:
cb114c54a4 am:
f96d9741b1" into pi-dev-plus-aosp
Andreas Gampe [Fri, 9 Mar 2018 20:04:25 +0000 (20:04 +0000)]
Merge "Zygote: Set libbase default tag on fork" am:
cb114c54a4
am:
f96d9741b1
Change-Id: Ic4a401a74fad387d091bc8f19f41e23d6cc458fa
Android Build Merger (Role) [Fri, 9 Mar 2018 20:03:25 +0000 (20:03 +0000)]
Merge "Merge "Add intent category for slices to help identify them" into pi-dev am:
d8bc0026e0" into pi-dev-plus-aosp
Jason Monk [Fri, 9 Mar 2018 20:02:40 +0000 (20:02 +0000)]
Merge "Add intent category for slices to help identify them" into pi-dev
am:
d8bc0026e0
Change-Id: Ic4098e99ba93781be13862ae4b06b0fe320c4309
Android Build Merger (Role) [Fri, 9 Mar 2018 19:52:25 +0000 (19:52 +0000)]
Merge "Merge "Add lockHardwareWideColorGamutCanvas." into pi-dev am:
c481d0a43c" into pi-dev-plus-aosp
Peiyong Lin [Fri, 9 Mar 2018 19:51:51 +0000 (19:51 +0000)]
Merge "Add lockHardwareWideColorGamutCanvas." into pi-dev
am:
c481d0a43c
Change-Id: I31e9dab7d5b00aaf5aa7e1c3d756426402f17bc8
Android Build Merger (Role) [Fri, 9 Mar 2018 19:48:44 +0000 (19:48 +0000)]
Merge "Merge "SystemUI: Customize wifi indicator for China carriers" am:
439286d185 am:
e0a06e21b2" into pi-dev-plus-aosp
Eugene Susla [Fri, 9 Mar 2018 19:48:12 +0000 (19:48 +0000)]
Merge changes from topic "recognition_service-mnc-dev" into oc-dev
am:
714fb7ae84
Change-Id: I07cbecada20685467da9b82e101b7591ec285533
Minming Qi [Fri, 9 Mar 2018 19:48:10 +0000 (19:48 +0000)]
Merge "SystemUI: Customize wifi indicator for China carriers" am:
439286d185
am:
e0a06e21b2
Change-Id: I65d689f819db77de9062e85a1ec1628991dcc123
Android Build Merger (Role) [Fri, 9 Mar 2018 19:45:43 +0000 (19:45 +0000)]
Merge "Merge "Don't allow foreground notis to be blocked inline." into pi-dev am:
874b009137" into pi-dev-plus-aosp
Julia Reynolds [Fri, 9 Mar 2018 19:45:16 +0000 (19:45 +0000)]
Merge "Don't allow foreground notis to be blocked inline." into pi-dev
am:
874b009137
Change-Id: Iea8430a95c0a5299efaa2552967a13fb92c18aa7
Andreas Gampe [Fri, 9 Mar 2018 19:38:54 +0000 (19:38 +0000)]
Merge "Zygote: Set libbase default tag on fork"
am:
cb114c54a4
Change-Id: I7e7cb2d0b4b237a1f0314d4c236f080df796df23
Android Build Merger (Role) [Fri, 9 Mar 2018 19:38:54 +0000 (19:38 +0000)]
Merge "Merge "Display mobile data type icons in status bar." into pi-dev am:
b87b032786" into pi-dev-plus-aosp
Amin Shaikh [Fri, 9 Mar 2018 19:38:33 +0000 (19:38 +0000)]
Merge "Display mobile data type icons in status bar." into pi-dev
am:
b87b032786
Change-Id: Id99e54a74fd2deff9c65c78001e2145d10968e03
Mathew Inwood [Fri, 9 Mar 2018 19:38:20 +0000 (19:38 +0000)]
Merge "Fix reference to header file in art." am:
16416f0e10
am:
8431eb6c13
Change-Id: I5ae8e3e1c5f9cdbff7b0caf711efaefdc61a646e
Jake Wharton [Fri, 9 Mar 2018 19:32:13 +0000 (19:32 +0000)]
Merge "Correct directory location." into pi-dev
am:
ffc100e665
Change-Id: Iea2d0627386b1410902d6c1ceff53c09aff984be
Minming Qi [Fri, 9 Mar 2018 19:32:08 +0000 (19:32 +0000)]
Merge "SystemUI: Customize wifi indicator for China carriers"
am:
439286d185
Change-Id: I3d4c32e47d232c92209968cd73659bb33ef8f93c
Mathew Inwood [Fri, 9 Mar 2018 19:25:34 +0000 (19:25 +0000)]
Merge "Fix reference to header file in art."
am:
16416f0e10
Change-Id: If2fc63471245490df2fabaa9c257db20ba182fe6
TreeHugger Robot [Fri, 9 Mar 2018 19:17:00 +0000 (19:17 +0000)]
Merge "Update battery saver colors to make them more obvious" into pi-dev
TreeHugger Robot [Fri, 9 Mar 2018 19:05:29 +0000 (19:05 +0000)]
Merge "Add known uses to hidden API light greylist" into pi-dev
TreeHugger Robot [Fri, 9 Mar 2018 19:04:27 +0000 (19:04 +0000)]
Merge "Update alarm and messaging dnd filtering" into pi-dev
TreeHugger Robot [Fri, 9 Mar 2018 18:55:32 +0000 (18:55 +0000)]
Merge "Add PrintSpooler to system app whitelist" into pi-dev
TreeHugger Robot [Fri, 9 Mar 2018 18:53:35 +0000 (18:53 +0000)]
Merge "Move notification policy log to ZenLog" into pi-dev
Christopher Tate [Fri, 9 Mar 2018 18:47:30 +0000 (18:47 +0000)]
Merge "Jobs in 'active' apps are not subject to standby" into pi-dev
am:
2d157b1bcc
Change-Id: I33a12f57ea8a262230807dfc9f9e858dd0e26368
Alan Viverette [Fri, 9 Mar 2018 18:43:02 +0000 (18:43 +0000)]
Merge changes from topic "viewpager_state" into oc-dev
* changes:
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0 am:
cb362192e8 am:
bc42f76941 am:
c42091667c am:
aebf5c06df am:
d04ccc6608 am:
b3e984c412
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0 am:
cb362192e8 am:
bc42f76941 am:
c42091667c am:
aebf5c06df am:
d04ccc6608
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0 am:
cb362192e8 am:
bc42f76941 am:
c42091667c am:
aebf5c06df
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0 am:
cb362192e8 am:
bc42f76941 am:
c42091667c
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0 am:
cb362192e8 am:
bc42f76941
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0 am:
cb362192e8
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1
Update internal ViewPager's SavedState to match Support Library version
Eugene Susla [Fri, 9 Mar 2018 18:42:08 +0000 (18:42 +0000)]
Merge changes from topic "recognition_service-mnc-dev" into oc-dev
* changes:
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082 am:
26aaadd3b5 skipped:
a1ad0de1f7 am:
cf92266ad9 am:
773f021348 am:
bca318e527 am:
122f5e51bf skipped:
36e5764193
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082 am:
26aaadd3b5 skipped:
a1ad0de1f7 am:
cf92266ad9 am:
773f021348 am:
bca318e527 am:
122f5e51bf
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082 am:
26aaadd3b5 skipped:
a1ad0de1f7 am:
cf92266ad9 am:
773f021348 am:
bca318e527
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082 am:
26aaadd3b5 skipped:
a1ad0de1f7 am:
cf92266ad9 am:
773f021348
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082 am:
26aaadd3b5 skipped:
a1ad0de1f7 am:
cf92266ad9
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082 am:
26aaadd3b5 skipped:
a1ad0de1f7
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082 am:
26aaadd3b5
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe
[DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService
Ying Xu [Fri, 9 Mar 2018 18:39:36 +0000 (18:39 +0000)]
Merge changes I64009362,I8ebb617c into pi-dev
am:
3cec8d5336 -s ours
Change-Id: Ia445d68dd3f5a605df300c299187fac0cf37e6d6
TreeHugger Robot [Fri, 9 Mar 2018 18:38:40 +0000 (18:38 +0000)]
Merge "Add vibrate on down over nav bar and tick on motion up" into pi-dev
Lei Yu [Fri, 9 Mar 2018 18:36:45 +0000 (18:36 +0000)]
Merge changes Ifec29546,Iaab1cc44 into pi-dev
am:
10046f49ef
Change-Id: Ic0cb1d93c252a6a6117e031eeb2af16fd67dd8a1
Mathieu Chartier [Fri, 9 Mar 2018 18:31:28 +0000 (18:31 +0000)]
Merge "Add sleep for profile saving in AppLaunch" into pi-dev
am:
a8cb58721c
Change-Id: Ib7ef89ab7c9c84f49c25869319e94f7b401b0457
Chen Xu [Fri, 9 Mar 2018 18:26:46 +0000 (18:26 +0000)]
Merge "Remove RuntimeException throws from TelephonyManager" into pi-dev
am:
85c0e8787d
Change-Id: I1be18e332e93e84b9502aa26e4057662070d562d
Rubin Xu [Fri, 9 Mar 2018 18:22:08 +0000 (18:22 +0000)]
Merge changes from topic "am-
af991497-a243-423d-8f58-
f6bc1131a734" into oc-dev am:
6e30a00c96 am:
f45dbc6a69 am:
184c75c2f0
am:
77ac94b2ce
Change-Id: I8f22075b7d9138a8353bb52d604e6af454129fbd
Jason Monk [Fri, 9 Mar 2018 18:21:43 +0000 (18:21 +0000)]
Merge "Add intent category for slices to help identify them" into pi-dev
Peiyong Lin [Fri, 9 Mar 2018 18:19:52 +0000 (18:19 +0000)]
Merge "Add lockHardwareWideColorGamutCanvas." into pi-dev
TreeHugger Robot [Fri, 9 Mar 2018 18:08:19 +0000 (18:08 +0000)]
Merge "Don't allow foreground notis to be blocked inline." into pi-dev
TreeHugger Robot [Fri, 9 Mar 2018 18:03:55 +0000 (18:03 +0000)]
Merge "Display mobile data type icons in status bar." into pi-dev
Jordan Liu [Fri, 9 Mar 2018 18:01:50 +0000 (18:01 +0000)]
Merge "Support ENVELOPE (EVENT DOWNLOAD - User activity) command" am:
f5b680c82a
am:
05bb2fd410 -s ours
Change-Id: Ie0a23a22aa11ada0f2b142763fab53c39794c996
Jake Wharton [Fri, 9 Mar 2018 18:01:13 +0000 (18:01 +0000)]
Merge "Correct directory location." into pi-dev
Jake Wharton [Fri, 9 Mar 2018 17:53:21 +0000 (12:53 -0500)]
Correct directory location.
This moved as part of
e94ca6676f8f845741369d4967255f642a4cefbb.
Bug:
74390715
Test: none
Exempt-From-Owner-Approval: build fix of support library folder reference
Change-Id: I4109ef44748deb03a91e372b40b85d025f0d2765
Treehugger Robot [Fri, 9 Mar 2018 17:52:50 +0000 (17:52 +0000)]
Merge "Zygote: Set libbase default tag on fork"
TreeHugger Robot [Fri, 9 Mar 2018 17:50:42 +0000 (17:50 +0000)]
Merge "Jobs in 'active' apps are not subject to standby" into pi-dev
Jordan Liu [Fri, 9 Mar 2018 17:48:46 +0000 (17:48 +0000)]
Merge "Support ENVELOPE (EVENT DOWNLOAD - User activity) command"
am:
f5b680c82a
Change-Id: I7a481dbbf35f0a21e6b2268d1293a614d589e992
Ying Xu [Fri, 9 Mar 2018 17:44:09 +0000 (17:44 +0000)]
Merge changes I64009362,I8ebb617c into pi-dev
* changes:
Do not throw RuntimeException from stopScan().
Address the API review comments.
Lei Yu [Fri, 9 Mar 2018 17:41:27 +0000 (17:41 +0000)]
Merge changes Ifec29546,Iaab1cc44 into pi-dev
* changes:
Add metrics for battery tip
Add metric for restrict app tip and high usage tip
Treehugger Robot [Fri, 9 Mar 2018 17:35:53 +0000 (17:35 +0000)]
Merge "SystemUI: Customize wifi indicator for China carriers"
Mathieu Chartier [Fri, 9 Mar 2018 17:25:25 +0000 (17:25 +0000)]
Merge "Add sleep for profile saving in AppLaunch" into pi-dev
Mihai Popa [Fri, 9 Mar 2018 17:06:01 +0000 (17:06 +0000)]
Merge changes from topic "magnifier_expose_size_and_zoom-pi-dev" into pi-dev
am:
6d7cbf5e7b
Change-Id: I040e97734510b3720c2b8ef7aa6e15a55954938c
Chen Xu [Fri, 9 Mar 2018 17:02:41 +0000 (17:02 +0000)]
Merge "Remove RuntimeException throws from TelephonyManager" into pi-dev
Mihai Popa [Fri, 9 Mar 2018 16:59:17 +0000 (16:59 +0000)]
[Magnifier-29] Expose size and zoom in the API
am:
17ea30584a
Change-Id: I2c4fc371ba1ddc3605b6976a648f8ba802b76f96
OSDN Git Service
