OSDN Git Service
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
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
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
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
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: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
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
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
TreeHugger Robot [Fri, 9 Mar 2018 14:40:41 +0000 (14:40 +0000)]
Merge "Add logging for screen timeout override." into pi-dev
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
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
Hyundo Moon [Fri, 9 Mar 2018 14:20:47 +0000 (14:20 +0000)]
Merge "MediaSession2: Ensure NonNull/Nullable for parameters of public methods" into pi-dev
am:
5cef8984ba
Change-Id: I93c7e277ceb5e0dcfef02d279d8334bc0ded4d98
yro [Fri, 9 Mar 2018 14:15:52 +0000 (14:15 +0000)]
Merge "Add team members in OWNER file" into pi-dev
am:
3ce208c1e9
Change-Id: I52077ca3dfc9a36c29c03b3a39998502f05f4e55
Kweku Adams [Fri, 9 Mar 2018 14:10:58 +0000 (14:10 +0000)]
Merge "Documenting some core proto style conventions." into pi-dev
am:
df9737d286
Change-Id: I9bbef2a5c5b9d37d4a4e719032203c31a21bf3d3
Wale Ogunwale [Fri, 9 Mar 2018 14:05:31 +0000 (14:05 +0000)]
Merge "Marked testFocusedWindowMultipleDisplays as flaky" into pi-dev
am:
e8b15263e0
Change-Id: I51cc911290bd46dcab725c8a31685d464b014098
Mihai Popa [Wed, 7 Mar 2018 12:25:21 +0000 (12:25 +0000)]
[Magnifier-31] Do not magnify outside current line
Currently, after the cursor is reaching the end of a line, the magnifier
keeps following the finger even if the cursor cannot move anymore.
This CL limits the movement of the magnifier, ensuring it stays between
the bounds of the text line. Also, when the finger gets too far from the
end of the line, we dismiss the magnifier. We consider it went too far
when the cursor is not visible anymore inside the magnifier.
Bug:
72314536
Test: manual testing (both English and Arabic)
Test: atest FrameworksCoreTests:android.widget.TextViewActivityTest
Test: atest CtsWidgetTestCases:android.widget.cts.TextViewTest
Change-Id: I8dafba1fc8e7b8e482526e818831ece2ee20ac27
(cherry picked from commit
dfc752bc745ca272234be41f2b54d49eccece84d)
Merged-In: I8dafba1fc8e7b8e482526e818831ece2ee20ac27
Julia Reynolds [Fri, 9 Mar 2018 13:38:06 +0000 (13:38 +0000)]
Merge changes from topic "jr-viseffects" into pi-dev
* changes:
Make systemui obey new visual effect flags
Expand the visual effects that DND can suppress.
Mihai Popa [Tue, 6 Mar 2018 14:24:07 +0000 (14:24 +0000)]
[Magnifier-29] Expose size and zoom in the API
The CL exposes the size and the zoom of the magnifier in the public API.
These are required for implementing a number of UX requests in WebView
and Chrome - see the two bugs referenced.
Also, the CL fixes a bug in the #getContent() TestApi, which was
returning the bitmap before (instead of after) scaling.
Bug:
70608551
Bug:
72314536
Test: atest CtsWidgetTestCases:android.widget.cts.MagnifierTest
Change-Id: Idc583b923010d7dca075b05b6f4dbafa74cfec1f
(cherry picked from commit
e1b93ddcbd40334664d6360d60525981cf3a3981)
Merged-In: Idc583b923010d7dca075b05b6f4dbafa74cfec1f
Chalard Jean [Fri, 9 Mar 2018 13:12:08 +0000 (13:12 +0000)]
Merge "Deprecate most of NetworkInfo." am:
92a9847de9
am:
c8b846e1ac
Change-Id: Ia00fbfa38a28583198278df2a94642ed8139d7d1
Treehugger Robot [Fri, 9 Mar 2018 12:58:26 +0000 (12:58 +0000)]
Merge "Check if mSurface is valid before create SurfaceSession"
Chalard Jean [Fri, 9 Mar 2018 12:57:15 +0000 (12:57 +0000)]
Merge "Deprecate most of NetworkInfo."
am:
92a9847de9
Change-Id: I1d12c161f7e388451059a92b68a1511fbf8006a1
TreeHugger Robot [Fri, 9 Mar 2018 12:42:55 +0000 (12:42 +0000)]
Merge "Update javadoc for WifiConfiguration.setHttpProxy" into pi-dev
Adrian Roos [Fri, 9 Mar 2018 12:40:37 +0000 (12:40 +0000)]
Merge "SysUI: Fix a bunch of hacks around insets and cutouts" into pi-dev
TreeHugger Robot [Fri, 9 Mar 2018 12:40:22 +0000 (12:40 +0000)]
Merge "Add BaseNetdEventCallback class that provides no-op implementations for INetdEventCallback." into pi-dev
Jorim Jaggi [Fri, 9 Mar 2018 12:05:01 +0000 (12:05 +0000)]
Merge changes I46e93397,Ie0a157a9 into pi-dev
* changes:
Also set calling pid when registering for next activity start
Revert "Revert "Elevate remote/recents animation priority""
dalyk [Thu, 8 Mar 2018 21:33:25 +0000 (16:33 -0500)]
Add BaseNetdEventCallback class that provides no-op implementations for INetdEventCallback.
Test: None
Bug:
71828272
Merged-In: I261015d0d3e7e4159bb514742a6c588bfd34e795
Merged-In: I3a701fc52641615bf197f980022a61518c7347f4
Merged-In: I1ed5ede74ca14718e6d4f8a9a8d57de6026c9e93
Merged-In: Ib0c4b69a24144d27f672ec716fb9a8f06987ce7d
Change-Id: I75e0620f82195f18befe9dc079492a8c69bb764b
(cherry picked from commit
985d89a6e0412a3b0e8b1519de8ebffdbf708d31)
David Brazdil [Fri, 9 Mar 2018 10:07:41 +0000 (10:07 +0000)]
Merge "Whitelist all @SystemApi and @TestApi for hidden API" into pi-dev
Chalard Jean [Fri, 9 Mar 2018 09:46:11 +0000 (09:46 +0000)]
Merge "Deprecate most of NetworkInfo."
TreeHugger Robot [Fri, 9 Mar 2018 09:22:54 +0000 (09:22 +0000)]
Merge "Display shortcut inline with item title in cascading menu" into pi-dev
Hyundo Moon [Fri, 9 Mar 2018 08:28:08 +0000 (08:28 +0000)]
Merge "MediaSession2: Ensure NonNull/Nullable for parameters of public methods" into pi-dev
TreeHugger Robot [Fri, 9 Mar 2018 07:37:43 +0000 (07:37 +0000)]
Merge "Add team members in OWNER file" into pi-dev
yro [Fri, 9 Mar 2018 02:41:03 +0000 (18:41 -0800)]
Add team members in OWNER file
Bug:
74415902
Test: no test necessary
Change-Id: I39d0a5cb9c6e8520fd29881442e66961096d52fc
Erik Kline [Fri, 9 Mar 2018 07:24:30 +0000 (07:24 +0000)]
Merge "Add BaseNetdEventCallback class that provides no-op implementations for INetdEventCallback." am:
59787b4247
am:
30563dee52
Change-Id: I1ed5ede74ca14718e6d4f8a9a8d57de6026c9e93
Jaewan Kim [Fri, 9 Mar 2018 07:04:03 +0000 (07:04 +0000)]
Merge "MediaSession2: Implement MediaSession2#updatePlayer()" into pi-dev
am:
790a31ee31
Change-Id: I8240c7c4a1ab0e80d9253a728ac8fa33b1b5535c
Erik Kline [Fri, 9 Mar 2018 07:01:21 +0000 (07:01 +0000)]
Merge "Add BaseNetdEventCallback class that provides no-op implementations for INetdEventCallback."
am:
59787b4247
Change-Id: I63d8b36ec1594134bce8c60eb653e9b53a1b1963
Mathieu Chartier [Fri, 9 Mar 2018 06:49:34 +0000 (06:49 +0000)]
Merge changes from topic "cdex_commands" into pi-dev
am:
041b38479d -s ours
Change-Id: Ic5a5df89536a53b68f462478d394874f691a8fe8
Makoto Onuki [Fri, 9 Mar 2018 06:45:00 +0000 (06:45 +0000)]
Merge "Add global setting for auto-battery saver threshold max" into pi-dev
am:
fa63f6895b
Change-Id: Id4e36e3c2b1eb5ab57cd491f71f7ddd5f1736fe3
Winson Chung [Fri, 9 Mar 2018 06:40:25 +0000 (06:40 +0000)]
Merge "Don't hold AM lock during assist data request." into pi-dev
am:
4d270b6d19
Change-Id: I078a3353667dec6895bdf66e768ebc6019d3ef4e
Chalard Jean [Thu, 8 Mar 2018 04:54:53 +0000 (13:54 +0900)]
Deprecate most of NetworkInfo.
getType, getTypeName, isConnectedOrConnecting, isConnected,
isAvaisable, isFailover, isRoaming, getState, getDetailedState,
getReason, and the TYPE_* constants in ConnectivityManager
along with methods that use them are now stacked on a boat
bound for the other side of the Styx.
Test: no code changes
Bug:
62844794
Change-Id: Idd70763de5b1af5580b4734cd443ac4b570069cc
Bookatz [Fri, 9 Mar 2018 06:35:58 +0000 (06:35 +0000)]
Merge "Fix statsd crash due to bad bucket index" into pi-dev
am:
7ad26e4bad
Change-Id: I7ca80eda49b401ea3eb2b045f0e6797d640c584e