OSDN Git Service
TreeHugger Robot [Sat, 10 Mar 2018 00:15:34 +0000 (00:15 +0000)]
Merge "Sort A11yService#getWindows by layer descending"
TreeHugger Robot [Sat, 10 Mar 2018 00:02:50 +0000 (00:02 +0000)]
Merge "hide serialization methods on Picture"
Android Build Merger (Role) [Fri, 9 Mar 2018 22:36:00 +0000 (22:36 +0000)]
Merge "Merge "Jobs in 'active' apps are not subject to standby" into pi-dev am:
2d157b1bcc am:
5ed3266401"
Christopher Tate [Fri, 9 Mar 2018 22:35:19 +0000 (22:35 +0000)]
Merge "Jobs in 'active' apps are not subject to standby" into pi-dev am:
2d157b1bcc
am:
5ed3266401
Change-Id: I3627a1ae7f99f820aab9c6a112d3b7e4b39ea9bc
Android Build Merger (Role) [Fri, 9 Mar 2018 22:26:40 +0000 (22:26 +0000)]
Merge "Merge changes I64009362,I8ebb617c into pi-dev am:
3cec8d5336 -s ours am:
03828b0bce -s ours"
Ying Xu [Fri, 9 Mar 2018 22:26:14 +0000 (22:26 +0000)]
Merge changes I64009362,I8ebb617c into pi-dev am:
3cec8d5336 -s ours
am:
03828b0bce -s ours
Change-Id: Ib9749ac4b14ea0c7437d87d2f7404cef7bae3336
TreeHugger Robot [Fri, 9 Mar 2018 22:22:19 +0000 (22:22 +0000)]
Merge "Fix doc bugs"
Mike Reed [Mon, 26 Feb 2018 20:42:00 +0000 (15:42 -0500)]
hide serialization methods on Picture
Test: make
Bug:
14646703
Change-Id: I50bde70c16f7eaf3f31a373e5507a2c34a6eb1e7
Android Build Merger (Role) [Fri, 9 Mar 2018 20:14:32 +0000 (20:14 +0000)]
Merge "Merge changes Ifec29546,Iaab1cc44 into pi-dev am:
10046f49ef am:
a4eab284e8"
Lei Yu [Fri, 9 Mar 2018 20:14:03 +0000 (20:14 +0000)]
Merge changes Ifec29546,Iaab1cc44 into pi-dev am:
10046f49ef
am:
a4eab284e8
Change-Id: I84e5d82269fd425e778b020c01f11fcce8ca5a78
Android Build Merger (Role) [Fri, 9 Mar 2018 20:08:38 +0000 (20:08 +0000)]
Merge "Merge "Add sleep for profile saving in AppLaunch" into pi-dev am:
a8cb58721c am:
786fa35ae2"
Mathieu Chartier [Fri, 9 Mar 2018 20:07:44 +0000 (20:07 +0000)]
Merge "Add sleep for profile saving in AppLaunch" into pi-dev am:
a8cb58721c
am:
786fa35ae2
Change-Id: Icfb89e67f5e446c76bcef0bc2a1e6e544d6527af
Android Build Merger (Role) [Fri, 9 Mar 2018 20:02:05 +0000 (20:02 +0000)]
Merge "Merge "Remove RuntimeException throws from TelephonyManager" into pi-dev am:
85c0e8787d am:
6ccb19234e"
Chen Xu [Fri, 9 Mar 2018 20:01:36 +0000 (20:01 +0000)]
Merge "Remove RuntimeException throws from TelephonyManager" into pi-dev am:
85c0e8787d
am:
6ccb19234e
Change-Id: I7495b19901c529bff01c4d59792fe8ce1af59d55
TreeHugger Robot [Fri, 9 Mar 2018 19:57:50 +0000 (19:57 +0000)]
Merge changes from topics "voicemail-perms", "telman-perms"
* changes:
Allow carrier-privileged apps to access voicemail provider.
Allow carrier privileged apps to access Telephony/Subscription APIs.
Rubin Xu [Fri, 9 Mar 2018 19:55:10 +0000 (19:55 +0000)]
Merge changes from topic "am-
af991497-a243-423d-8f58-
f6bc1131a734" into oc-dev am:
6e30a00c96 am:
f45dbc6a69 am:
184c75c2f0 am:
77ac94b2ce
am:
7c65e0e79e
Change-Id: I7a938ac8762bd9ba69c9bdb7f065524df44097d7
Jordan Liu [Fri, 9 Mar 2018 19:32:27 +0000 (19:32 +0000)]
Merge "Support ENVELOPE (EVENT DOWNLOAD - User activity) command" am:
f5b680c82a am:
05bb2fd410 -s ours
am:
85b54b0770 -s ours
Change-Id: Id405322c694a3ef110bdce12d1a78f159f39ad30
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
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
TreeHugger Robot [Fri, 9 Mar 2018 18:36:32 +0000 (18:36 +0000)]
Merge "Update legacy font renderer to use the updated method names from Skia"
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
Android Build Merger (Role) [Fri, 9 Mar 2018 18:09:24 +0000 (18:09 +0000)]
Merge changes from topic "am-
697b57816ff14b78a80abed4810cfc0f"
* changes:
Merge changes from topic "magnifier_expose_size_and_zoom-pi-dev" into pi-dev am:
6d7cbf5e7b am:
41a958ef15 -s ours
[Magnifier-29] Expose size and zoom in the API am:
17ea30584a am:
ebbcd2da08 -s ours
Mihai Popa [Fri, 9 Mar 2018 18:08:28 +0000 (18:08 +0000)]
Merge changes from topic "magnifier_expose_size_and_zoom-pi-dev" into pi-dev am:
6d7cbf5e7b
am:
41a958ef15 -s ours
Change-Id: I2d87fa6483eb9aea9768bd9cab075396e083c1bb
Mihai Popa [Fri, 9 Mar 2018 18:03:22 +0000 (18:03 +0000)]
[Magnifier-29] Expose size and zoom in the API am:
17ea30584a
am:
ebbcd2da08 -s ours
Change-Id: I4740ac47f8a267c477a2741adbdb98efb2a10b06
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
Android Build Merger (Role) [Fri, 9 Mar 2018 17:59:11 +0000 (17:59 +0000)]
Merge "Merge "Fix opening tuner session with HAL 2.0." into pi-dev am:
7072bbb1e2 am:
9f60594165"
Tomasz Wasilczyk [Fri, 9 Mar 2018 17:58:38 +0000 (17:58 +0000)]
Merge "Fix opening tuner session with HAL 2.0." into pi-dev am:
7072bbb1e2
am:
9f60594165
Change-Id: I24d38209634073ee6deb73fa97bb41094550baa8
Android Build Merger (Role) [Fri, 9 Mar 2018 17:55:04 +0000 (17:55 +0000)]
Merge "Merge "[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids" into oc-dev am:
a9df845321 am:
8dddc5e1f8 am:
edb8872513 -s ours am:
f08622b28f -s ours am:
86150fa263 -s ours"
Rubin Xu [Fri, 9 Mar 2018 17:54:44 +0000 (17:54 +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
am:
86150fa263 -s ours
Change-Id: I2e4ce57ba8d3dd8b2f0b8a903893b17e9d818999
Android Build Merger (Role) [Fri, 9 Mar 2018 17:54:37 +0000 (17:54 +0000)]
Merge "Merge "Add unit test to verify option propagation from starter to modifier." into pi-dev am:
c7d733fe24 am:
46b1d0fb65"
Bryce Lee [Fri, 9 Mar 2018 17:54:15 +0000 (17:54 +0000)]
Merge "Add unit test to verify option propagation from starter to modifier." into pi-dev am:
c7d733fe24
am:
46b1d0fb65
Change-Id: Iab0eff5851eff360768dc0e76c084d9b651f05dd
Jeff Davidson [Wed, 28 Feb 2018 18:20:55 +0000 (10:20 -0800)]
Allow carrier-privileged apps to access voicemail provider.
Bug:
70041899
Test: TreeHugger + tests in CL topic
Change-Id: I437695ca42e42c84a9a3027d9314a7f7175b978d
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
Android Build Merger (Role) [Fri, 9 Mar 2018 17:50:11 +0000 (17:50 +0000)]
Merge "Merge "Do not call checkReadyForSleep recursively." into pi-dev am:
e5eebd5ccd am:
eab48999a2"
Bryce Lee [Fri, 9 Mar 2018 17:49:47 +0000 (17:49 +0000)]
Merge "Do not call checkReadyForSleep recursively." into pi-dev am:
e5eebd5ccd
am:
eab48999a2
Change-Id: I7af861f0a940629f3f730f169abc02422091bac5
TreeHugger Robot [Fri, 9 Mar 2018 17:49:34 +0000 (17:49 +0000)]
Merge "Add measurements for TransportClient connections"
Jeff Davidson [Fri, 23 Feb 2018 23:27:46 +0000 (15:27 -0800)]
Allow carrier privileged apps to access Telephony/Subscription APIs.
-All public APIs in TelephonyManager which require READ_PHONE_STATE
will now also be documented to accept carrier privileged callers as
well. (One exception is the change callbacks in each, which will be
addressed in a separate CL).
-For SubscriptionManager, callers without READ_PHONE_STATE will now be
able to access the subscription list; however, the resulting list will
be filtered to only include subscriptions for which the caller has
carrier privileges.
-All @see references to hasCarrierPrivileges have been removed in
favor of an inline {@link}. The @see section is set apart from the
rest of the Javadoc and thus appears out of context of where it's
actually relevant; moreover, it is often placed in the middle of a
line which makes it invalid. Using {@link} inlines the reference where
it's actually relevant.
-@SuppressAutodoc is added to any public method which has a
@RequiresPermission declaration that isn't a sufficient description of
the allowed callers, i.e. for APIs which accept carrier-privileged
callers, or the default dialer app or other exceptional cases. This
ensures redundant (but incorrect) requires permission declarations
aren't autogenerated.
Bug:
70041899
Test: TreeHugger, unit tests in topic
Change-Id: Ia5cc145c19d99fe2b87e3425bb95281980edef6f
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
Amin Shaikh [Fri, 9 Mar 2018 17:45:08 +0000 (17:45 +0000)]
Merge "Move mobile signal indicator to QS footer." into pi-dev am:
75a81749f3
am:
b837c0d0eb
Change-Id: Ibb3f7ee0e0f3ad877a3e20c537a8d49a0a6555a9
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
Michael Wright [Fri, 9 Mar 2018 17:36:28 +0000 (17:36 +0000)]
Merge "Add logging for screen timeout override." into pi-dev am:
82022ba876
am:
ce962fafdd
Change-Id: Ie44b1a4ab3e9387fe62dfebedf02f35e6bdeee61
Mathieu Chartier [Fri, 9 Mar 2018 17:25:25 +0000 (17:25 +0000)]
Merge "Add sleep for profile saving in AppLaunch" into pi-dev
Derek Sollenberger [Fri, 9 Mar 2018 16:46:51 +0000 (11:46 -0500)]
Update legacy font renderer to use the updated method names from Skia
Part 2
Test: hwui_unit_tests
Change-Id: I749b0339dd05589d43e04b04e68df286b69884af
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
Android Build Merger (Role) [Fri, 9 Mar 2018 17:05:55 +0000 (17:05 +0000)]
Merge changes from topic "am-
69f59facfaf341b3af3e902b2376f45d"
* changes:
Merge changes from topic "am-
a59407fb236f46a7aa97883e87c6bea9" into pi-dev-plus-aosp am:
583f064548
Expand the visual effects that DND can suppress. am:
ccc6ae64ff am:
02cac6c94f
Julia Reynolds [Fri, 9 Mar 2018 17:04:13 +0000 (17:04 +0000)]
Merge changes from topic "am-
a59407fb236f46a7aa97883e87c6bea9" into pi-dev-plus-aosp
am:
583f064548
Change-Id: I4cc7151c814356c787f9f5a6f96d56dd546fc0eb
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
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
Julia Reynolds [Fri, 9 Mar 2018 16:49:53 +0000 (16:49 +0000)]
Expand the visual effects that DND can suppress. am:
ccc6ae64ff
am:
02cac6c94f
Change-Id: I63fc9073cba68d2a36c81fb32fcf3a981efd7871
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
Android Build Merger (Role) [Fri, 9 Mar 2018 16:35:29 +0000 (16:35 +0000)]
Merge "Merge "Merge "Update javadoc for WifiConfiguration.setHttpProxy" into pi-dev am:
21e331ed2d" into pi-dev-plus-aosp am:
3692e8126b"
Rubin Xu [Fri, 9 Mar 2018 16:35:00 +0000 (16:35 +0000)]
Merge "Merge "Update javadoc for WifiConfiguration.setHttpProxy" into pi-dev am:
21e331ed2d" into pi-dev-plus-aosp
am:
3692e8126b
Change-Id: If366a5e86d32d9ebb77f0b15e7be1c7fbfeeb547
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
TreeHugger Robot [Fri, 9 Mar 2018 16:31:08 +0000 (16:31 +0000)]
Merge "Allow TextClassifierServices to get a hold of a local TextClassifer."
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
Shibin George [Fri, 9 Mar 2018 16:25:20 +0000 (16:25 +0000)]
Merge "Merge "Check if mSurface is valid before create SurfaceSession" am:
fe118cfd10 am:
07eeea788a" into pi-dev-plus-aosp
am:
82d291ec17
Change-Id: Ief5fd677b1bb7b3dc051b6a3332eeb1c7726535f
Jordan Liu [Fri, 9 Mar 2018 16:20:09 +0000 (16:20 +0000)]
Merge "Support ENVELOPE (EVENT DOWNLOAD - User activity) command"
Adrian Roos [Fri, 9 Mar 2018 16:13:12 +0000 (16:13 +0000)]
Merge "SysUI: Fix a bunch of hacks around insets and cutouts" into pi-dev am:
802bf39664
am:
d37b8ac89d
Change-Id: I9e0bd8759f8f35bca89bff773319b2995ab52fb7
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
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
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
dalyk [Fri, 9 Mar 2018 15:37:45 +0000 (15:37 +0000)]
Merge "Add BaseNetdEventCallback class that provides no-op implementations for INetdEventCallback." into pi-dev am:
e1a6d37840 -s ours
am:
9d549ce37d -s ours
Change-Id: Idfda56aea651578371f89aa3b3fa39bb614d9e2e
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
Jorim Jaggi [Fri, 9 Mar 2018 15:29:16 +0000 (15:29 +0000)]
Merge changes I46e93397,Ie0a157a9 into pi-dev am:
3a78ec6ae4
am:
c5f88e6872
Change-Id: I3ecfc41762d3bcc099a4575154b6db22f56288c9
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
David Brazdil [Fri, 9 Mar 2018 15:18:33 +0000 (15:18 +0000)]
Merge "Whitelist all @SystemApi and @TestApi for hidden API" into pi-dev am:
f8a69fdd7a
am:
e6fd257d5b
Change-Id: Id52fa07c1eb1e2f5aa3b4c6548cb9574a10dc962
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
Vladislav Kaznacheev [Fri, 9 Mar 2018 15:03:02 +0000 (15:03 +0000)]
Merge "Display shortcut inline with item title in cascading menu" into pi-dev am:
ae957a780e
am:
a26f82e9af
Change-Id: I3b6b532736a12b10ec0646608832216266c8c378
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
Hyundo Moon [Fri, 9 Mar 2018 14:51:52 +0000 (14:51 +0000)]
Merge "MediaSession2: Ensure NonNull/Nullable for parameters of public methods" into pi-dev am:
5cef8984ba
am:
2006407144
Change-Id: I5cff047f7200ed85424c473ffd699fcc2f3bddbb
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
TreeHugger Robot [Fri, 9 Mar 2018 14:40:41 +0000 (14:40 +0000)]
Merge "Add logging for screen timeout override." into pi-dev
yro [Fri, 9 Mar 2018 14:39:29 +0000 (14:39 +0000)]
Merge "Add team members in OWNER file" into pi-dev am:
3ce208c1e9
am:
8d62b9dd9e
Change-Id: Ic808129c80c5f019cbcbc0578c2a385c76d41829
Jorim Jaggi [Fri, 9 Mar 2018 14:38:38 +0000 (14:38 +0000)]
Merge changes I46e93397,Ie0a157a9 into pi-dev
am:
3a78ec6ae4
Change-Id: Iab137d16d15e47fa63016d3f3f4702aa727d7ccd
David Brazdil [Fri, 9 Mar 2018 14:33:02 +0000 (14:33 +0000)]
Merge "Whitelist all @SystemApi and @TestApi for hidden API" into pi-dev
am:
f8a69fdd7a
Change-Id: I2c7142fb2e121c38dcbbadc730933ad4993468e1
Kweku Adams [Fri, 9 Mar 2018 14:31:22 +0000 (14:31 +0000)]
Merge "Documenting some core proto style conventions." into pi-dev am:
df9737d286
am:
cddeb74c30
Change-Id: I8b51d3284f0649587e848d49f69ee044375e12de
Vladislav Kaznacheev [Fri, 9 Mar 2018 14:29:00 +0000 (14:29 +0000)]
Merge "Display shortcut inline with item title in cascading menu" into pi-dev
am:
ae957a780e
Change-Id: I484cb6f01191ac5ce044fd94f7e32970aec2dfb1
Wale Ogunwale [Fri, 9 Mar 2018 14:21:00 +0000 (14:21 +0000)]
Merge "Marked testFocusedWindowMultipleDisplays as flaky" into pi-dev am:
e8b15263e0
am:
2d6384edd7
Change-Id: I128352ed77e6b9d4b50c051ba6cb99437b81112b
OSDN Git Service
