OSDN Git Service
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: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
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
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
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
Andreas Gampe [Fri, 9 Mar 2018 21:58:43 +0000 (21:58 +0000)]
Merge "PackageManager: Avoid null access"
am:
9b8008e9e8
Change-Id: Iabb496c276c250ed8edde6da0fe419925f5426e3
Chris Tate [Fri, 9 Mar 2018 21:26:20 +0000 (21:26 +0000)]
Merge "Defer deleting a http cache"
Eric Schwarzenbach [Fri, 9 Mar 2018 21:19:10 +0000 (21:19 +0000)]
Merge "Add Duplex mode to ServiceState."
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: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
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: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
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
Treehugger Robot [Fri, 9 Mar 2018 16:58:58 +0000 (16:58 +0000)]
Merge "Fix reference to header file in art."
Tomasz Wasilczyk [Fri, 9 Mar 2018 16:51:20 +0000 (16:51 +0000)]
Merge "Fix opening tuner session with HAL 2.0." into pi-dev
am:
7072bbb1e2
Change-Id: Ie65b01455b80c404ae0886a5c5106c0d56d0fe8c
Rubin Xu [Fri, 9 Mar 2018 16:47:31 +0000 (16:47 +0000)]
Merge "[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids" into oc-dev am:
a9df845321 am:
8dddc5e1f8 am:
edb8872513 -s ours
am:
f08622b28f -s ours
Change-Id: I253a45882dd326fe11aa19d61affea8530c9c370
Bryce Lee [Fri, 9 Mar 2018 16:40:57 +0000 (16:40 +0000)]
Merge "Add unit test to verify option propagation from starter to modifier." into pi-dev
am:
c7d733fe24
Change-Id: I3a684ea65d0c841251514096fd6796f2d43f690d
Bryce Lee [Fri, 9 Mar 2018 16:36:24 +0000 (16:36 +0000)]
Merge "Do not call checkReadyForSleep recursively." into pi-dev
am:
e5eebd5ccd
Change-Id: I4e64f951fdfbbb2e1827849cbfbd9d14d931cca9
Amin Shaikh [Fri, 9 Mar 2018 16:31:46 +0000 (16:31 +0000)]
Merge "Move mobile signal indicator to QS footer." into pi-dev
am:
75a81749f3
Change-Id: I26498a9c31db5ad52f19d15b4d490919ef7c48c7
Michael Wright [Fri, 9 Mar 2018 16:27:12 +0000 (16:27 +0000)]
Merge "Add logging for screen timeout override." into pi-dev
am:
82022ba876
Change-Id: I890343f7cc9ff58a36752363943ee9c06081b021
Jordan Liu [Fri, 9 Mar 2018 16:20:09 +0000 (16:20 +0000)]
Merge "Support ENVELOPE (EVENT DOWNLOAD - User activity) command"
Rubin Xu [Fri, 9 Mar 2018 16:12:28 +0000 (16:12 +0000)]
Merge changes from topic "am-
af991497-a243-423d-8f58-
f6bc1131a734" into oc-dev am:
6e30a00c96 am:
f45dbc6a69
am:
184c75c2f0
Change-Id: Id724a10c23afc2fc9f1ac5eeef7853ec6b40a417
Mihai Popa [Fri, 9 Mar 2018 16:02:31 +0000 (16:02 +0000)]
Merge changes from topic "magnifier_expose_size_and_zoom-pi-dev" into pi-dev
* changes:
[Magnifier-31] Do not magnify outside current line
[Magnifier-29] Expose size and zoom in the API
Julia Reynolds [Thu, 8 Mar 2018 19:42:50 +0000 (14:42 -0500)]
Don't allow foreground notis to be blocked inline.
Offer a 'minimize' option instead.
Also I'm changing the guts, do a little layout
cleanup in the confirmation dialog.
Change-Id: I9f2ef824d1f322752bc4161356f16a5dae166caf
Fixes:
73898083
Fixes:
73657862
Fixes:
73657452
Test: runtest systemui-notification
Jason Monk [Thu, 8 Mar 2018 19:18:55 +0000 (14:18 -0500)]
Add intent category for slices to help identify them
Test: cts, testMapIntentToSlice
Bug:
73123733
Change-Id: I75c3e132861d04301f5c856c235eadfc4be8f9bc
Rubin Xu [Fri, 9 Mar 2018 15:55:09 +0000 (15:55 +0000)]
Merge changes from topic "am-
af991497-a243-423d-8f58-
f6bc1131a734" into oc-dev am:
6e30a00c96
am:
f45dbc6a69
Change-Id: Ic7d8a8dd5cff126f9995ba9aa3e1158d724e4403
Tomasz Wasilczyk [Fri, 9 Mar 2018 15:46:48 +0000 (15:46 +0000)]
Merge "Fix opening tuner session with HAL 2.0." into pi-dev
Amin Shaikh [Thu, 8 Mar 2018 15:08:13 +0000 (10:08 -0500)]
Display mobile data type icons in status bar.
Instead of showing the type in the top left corner of the signal.
- Add new status bar mobile data indicator assets
- Remove unused qs/status bar mobile data indicator assets
Bug:
72540392
Test: visual using demo mode
Change-Id: Ic63ad3307daabf2e0f023308b7e0682dbd29f1ca
Rubin Xu [Fri, 9 Mar 2018 15:38:37 +0000 (15:38 +0000)]
Merge "[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids" into oc-dev am:
a9df845321 am:
8dddc5e1f8
am:
edb8872513 -s ours
Change-Id: Ia1047b019f4ee8844a2dc45be534747d5e799224
Beverly [Thu, 8 Mar 2018 15:36:25 +0000 (10:36 -0500)]
Move notification policy log to ZenLog
- move to ZenLog to avoid log being dropped
Test: manual
Bug:
73612465
Change-Id: I9131ac3623cb0ebf69098f38b125654e469fd3af
Rubin Xu [Fri, 9 Mar 2018 15:35:36 +0000 (15:35 +0000)]
Merge changes from topic "am-
af991497-a243-423d-8f58-
f6bc1131a734" into oc-dev
am:
6e30a00c96
Change-Id: I70114bdaa8186e7a2bb23e7d4e2c33c5d5b17e60
Rubin Xu [Fri, 9 Mar 2018 15:33:05 +0000 (15:33 +0000)]
Merge "[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids" into oc-dev am:
a9df845321
am:
8dddc5e1f8
Change-Id: I52e47a1dec4e71c4002d2657cc99e712a39f8d34
Mathew Inwood [Fri, 9 Mar 2018 14:06:08 +0000 (14:06 +0000)]
Fix reference to header file in art.
The definition of the flags has moved at some point, update this comment to
point to the correct location.
Test: make
Change-Id: I2d7caa857e0061115b57a325db18cae605b464ee
Android Build Merger (Role) [Fri, 9 Mar 2018 15:21:23 +0000 (15:21 +0000)]
Merge changes from topic "am-
a59407fb236f46a7aa97883e87c6bea9" into pi-dev-plus-aosp
* changes:
Merge changes from topic "jr-viseffects" into pi-dev am:
0b4626aa23
Expand the visual effects that DND can suppress. am:
ccc6ae64ff
Julia Reynolds [Fri, 9 Mar 2018 15:18:43 +0000 (15:18 +0000)]
Merge changes from topic "jr-viseffects" into pi-dev
am:
0b4626aa23
Change-Id: I7448e6dd66c5bff50afd996b68030a53a6738842
Bryce Lee [Fri, 9 Mar 2018 15:18:40 +0000 (15:18 +0000)]
Merge "Add unit test to verify option propagation from starter to modifier." into pi-dev
Bryce Lee [Fri, 9 Mar 2018 15:18:27 +0000 (15:18 +0000)]
Merge "Do not call checkReadyForSleep recursively." into pi-dev
Rubin Xu [Fri, 9 Mar 2018 15:15:07 +0000 (15:15 +0000)]
Merge "[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids" into oc-dev
am:
a9df845321
Change-Id: I0d7f4421d10f977eb9071ba3478da771e58541ca
Julia Reynolds [Fri, 9 Mar 2018 15:10:14 +0000 (15:10 +0000)]
Expand the visual effects that DND can suppress.
am:
ccc6ae64ff
Change-Id: I216d9ffcbe4fe1876ba9e40063714aeae1f3add3
Android Build Merger (Role) [Fri, 9 Mar 2018 15:02:10 +0000 (15:02 +0000)]
Merge "Merge "Update javadoc for WifiConfiguration.setHttpProxy" into pi-dev am:
21e331ed2d" into pi-dev-plus-aosp
TreeHugger Robot [Fri, 9 Mar 2018 15:01:42 +0000 (15:01 +0000)]
Merge changes from topic "am-
af991497-a243-423d-8f58-
f6bc1131a734" into oc-dev
* changes:
[automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am:
41d8bf1fed am:
595f82f99e am:
3aaa23e1e2 am:
4b71619f50 skipped:
d56e2e2cd0
[automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am:
41d8bf1fed am:
595f82f99e am:
3aaa23e1e2 am:
4b71619f50
[automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am:
41d8bf1fed am:
595f82f99e am:
3aaa23e1e2
[automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am:
41d8bf1fed am:
595f82f99e
[automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am:
41d8bf1fed
[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids
Rubin Xu [Fri, 9 Mar 2018 15:01:37 +0000 (15:01 +0000)]
Merge "Update javadoc for WifiConfiguration.setHttpProxy" into pi-dev
am:
21e331ed2d
Change-Id: I853102b54fa895cf53da17cf8cdc2a0bc85c89a4
Rubin Xu [Fri, 9 Mar 2018 14:59:30 +0000 (14:59 +0000)]
Merge "[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids" into oc-dev
Android Build Merger (Role) [Fri, 9 Mar 2018 14:58:39 +0000 (14:58 +0000)]
Merge "Merge "Check if mSurface is valid before create SurfaceSession" am:
fe118cfd10 am:
07eeea788a" into pi-dev-plus-aosp
Shibin George [Fri, 9 Mar 2018 14:58:14 +0000 (14:58 +0000)]
Merge "Check if mSurface is valid before create SurfaceSession" am:
fe118cfd10
am:
07eeea788a
Change-Id: I0eb2ab54daa623e97135a149ff34751ef83559eb
Adrian Roos [Fri, 9 Mar 2018 14:57:18 +0000 (14:57 +0000)]
Merge "SysUI: Fix a bunch of hacks around insets and cutouts" into pi-dev
am:
802bf39664
Change-Id: I2ba1dbd6dfcf031d93cb0f83740977c3ad0cb21e
TreeHugger Robot [Fri, 9 Mar 2018 14:56:59 +0000 (14:56 +0000)]
Merge "Move mobile signal indicator to QS footer." into pi-dev
Shibin George [Fri, 9 Mar 2018 14:46:25 +0000 (14:46 +0000)]
Merge "Check if mSurface is valid before create SurfaceSession"
am:
fe118cfd10
Change-Id: I774c323f87ff9dba3dd6831b8a33e2b7161162cb
dalyk [Fri, 9 Mar 2018 14:42:21 +0000 (14:42 +0000)]
Merge "Add BaseNetdEventCallback class that provides no-op implementations for INetdEventCallback." into pi-dev
am:
e1a6d37840 -s ours
Change-Id: Id1eaffa35454dc01f792d2bfc8d9fadff0b60890
OSDN Git Service
