Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
361,805 Commits 3 Branches 0 Tags
efa8fb0778b39fa5d50dd40576ea25d3d68e48d2
Commit Graph

361805 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
efa8fb0778 Merge changes from topic "jr-viseffects" into pi-dev 
am: 0b4626aa23

Change-Id: I7448e6dd66c5bff50afd996b68030a53a6738842
 2018-03-09 15:18:43 +00:00
Julia Reynolds
02cac6c94f Expand the visual effects that DND can suppress. 
am: ccc6ae64ff

Change-Id: I216d9ffcbe4fe1876ba9e40063714aeae1f3add3
 2018-03-09 15:10:14 +00:00
Rubin Xu
8163708fb3 Merge "Update javadoc for WifiConfiguration.setHttpProxy" into pi-dev 
am: 21e331ed2d

Change-Id: I853102b54fa895cf53da17cf8cdc2a0bc85c89a4
 2018-03-09 15:01:37 +00:00
Adrian Roos
d37b8ac89d Merge "SysUI: Fix a bunch of hacks around insets and cutouts" into pi-dev 
am: 802bf39664

Change-Id: I2ba1dbd6dfcf031d93cb0f83740977c3ad0cb21e
 2018-03-09 14:57:18 +00:00
dalyk
9d549ce37d Merge "Add BaseNetdEventCallback class that provides no-op implementations for INetdEventCallback." into pi-dev 
am: e1a6d37840  -s ours

Change-Id: Id1eaffa35454dc01f792d2bfc8d9fadff0b60890
 2018-03-09 14:42:21 +00:00
Jorim Jaggi
c5f88e6872 Merge changes I46e93397,Ie0a157a9 into pi-dev 
am: 3a78ec6ae4

Change-Id: Iab137d16d15e47fa63016d3f3f4702aa727d7ccd
 2018-03-09 14:38:38 +00:00
David Brazdil
e6fd257d5b Merge "Whitelist all @SystemApi and @TestApi for hidden API" into pi-dev 
am: f8a69fdd7a

Change-Id: I2c7142fb2e121c38dcbbadc730933ad4993468e1
 2018-03-09 14:33:02 +00:00
Vladislav Kaznacheev
a26f82e9af Merge "Display shortcut inline with item title in cascading menu" into pi-dev 
am: ae957a780e

Change-Id: I484cb6f01191ac5ce044fd94f7e32970aec2dfb1
 2018-03-09 14:29:00 +00:00
Hyundo Moon
2006407144 Merge "MediaSession2: Ensure NonNull/Nullable for parameters of public methods" into pi-dev 
am: 5cef8984ba

Change-Id: I93c7e277ceb5e0dcfef02d279d8334bc0ded4d98
 2018-03-09 14:20:47 +00:00
yro
8d62b9dd9e Merge "Add team members in OWNER file" into pi-dev 
am: 3ce208c1e9

Change-Id: I52077ca3dfc9a36c29c03b3a39998502f05f4e55
 2018-03-09 14:15:52 +00:00
Kweku Adams
cddeb74c30 Merge "Documenting some core proto style conventions." into pi-dev 
am: df9737d286

Change-Id: I9bbef2a5c5b9d37d4a4e719032203c31a21bf3d3
 2018-03-09 14:10:58 +00:00
Wale Ogunwale
2d6384edd7 Merge "Marked testFocusedWindowMultipleDisplays as flaky" into pi-dev 
am: e8b15263e0

Change-Id: I51cc911290bd46dcab725c8a31685d464b014098
 2018-03-09 14:05:31 +00:00
Julia Reynolds
0b4626aa23 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.
 2018-03-09 13:38:06 +00:00
Chalard Jean
fdcef03493 Merge "Deprecate most of NetworkInfo." am: 92a9847de9 
am: c8b846e1ac

Change-Id: Ia00fbfa38a28583198278df2a94642ed8139d7d1
 2018-03-09 13:12:08 +00:00
Chalard Jean
c8b846e1ac Merge "Deprecate most of NetworkInfo." 
am: 92a9847de9

Change-Id: I1d12c161f7e388451059a92b68a1511fbf8006a1
 2018-03-09 12:57:15 +00:00
TreeHugger Robot
21e331ed2d Merge "Update javadoc for WifiConfiguration.setHttpProxy" into pi-dev 2018-03-09 12:42:55 +00:00
Adrian Roos
802bf39664 Merge "SysUI: Fix a bunch of hacks around insets and cutouts" into pi-dev 2018-03-09 12:40:37 +00:00
TreeHugger Robot
e1a6d37840 Merge "Add BaseNetdEventCallback class that provides no-op implementations for INetdEventCallback." into pi-dev 2018-03-09 12:40:22 +00:00
Jorim Jaggi
3a78ec6ae4 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""
 2018-03-09 12:05:01 +00:00
dalyk
28011a4180 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 985d89a6e0)
 2018-03-09 19:41:56 +09:00
David Brazdil
f8a69fdd7a Merge "Whitelist all @SystemApi and @TestApi for hidden API" into pi-dev 2018-03-09 10:07:41 +00:00
Chalard Jean
92a9847de9 Merge "Deprecate most of NetworkInfo." 2018-03-09 09:46:11 +00:00
TreeHugger Robot
ae957a780e Merge "Display shortcut inline with item title in cascading menu" into pi-dev 2018-03-09 09:22:54 +00:00
Hyundo Moon
5cef8984ba Merge "MediaSession2: Ensure NonNull/Nullable for parameters of public methods" into pi-dev 2018-03-09 08:28:08 +00:00
TreeHugger Robot
3ce208c1e9 Merge "Add team members in OWNER file" into pi-dev 2018-03-09 07:37:43 +00:00
yro
66781e1bf5 Add team members in OWNER file 
Bug: 74415902

Test: no test necessary
Change-Id: I39d0a5cb9c6e8520fd29881442e66961096d52fc
 2018-03-09 07:37:36 +00:00
Erik Kline
4ea65c2f00 Merge "Add BaseNetdEventCallback class that provides no-op implementations for INetdEventCallback." am: 59787b4247 
am: 30563dee52

Change-Id: I1ed5ede74ca14718e6d4f8a9a8d57de6026c9e93
 2018-03-09 07:24:30 +00:00
Jaewan Kim
9331c2d555 Merge "MediaSession2: Implement MediaSession2#updatePlayer()" into pi-dev 
am: 790a31ee31

Change-Id: I8240c7c4a1ab0e80d9253a728ac8fa33b1b5535c
 2018-03-09 07:04:03 +00:00
Erik Kline
30563dee52 Merge "Add BaseNetdEventCallback class that provides no-op implementations for INetdEventCallback." 
am: 59787b4247

Change-Id: I63d8b36ec1594134bce8c60eb653e9b53a1b1963
 2018-03-09 07:01:21 +00:00
Mathieu Chartier
d7972bd19e Merge changes from topic "cdex_commands" into pi-dev 
am: 041b38479d  -s ours

Change-Id: Ic5a5df89536a53b68f462478d394874f691a8fe8
 2018-03-09 06:49:34 +00:00
Makoto Onuki
03c48c3dab Merge "Add global setting for auto-battery saver threshold max" into pi-dev 
am: fa63f6895b

Change-Id: Id4e36e3c2b1eb5ab57cd491f71f7ddd5f1736fe3
 2018-03-09 06:45:00 +00:00
Winson Chung
9dae666322 Merge "Don't hold AM lock during assist data request." into pi-dev 
am: 4d270b6d19

Change-Id: I078a3353667dec6895bdf66e768ebc6019d3ef4e
 2018-03-09 06:40:25 +00:00
Chalard Jean
8117f93a49 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
 2018-03-09 15:38:25 +09:00
Bookatz
06832e0c68 Merge "Fix statsd crash due to bad bucket index" into pi-dev 
am: 7ad26e4bad

Change-Id: I7ca80eda49b401ea3eb2b045f0e6797d640c584e
 2018-03-09 06:35:58 +00:00
Etan Cohen
8b39af58fc Merge "[RTT] COARSE -> FINE permission requirements" into pi-dev 
am: f5435948d8

Change-Id: I0d5e35ffad577274547c7dd6bd9b2daaa4932b00
 2018-03-09 06:30:34 +00:00
Wei Jia
004f53709d Merge "MediaPlayer2Impl: fix getPlayerState." into pi-dev 
am: af6cb35749

Change-Id: Ica02002122fe7b5eb579482091336ed87a5dad20
 2018-03-09 06:25:34 +00:00
Jack He
ab25bd1372 Merge "Bluetooth: Separate enable and disable Reasons from package name" into pi-dev 
am: 7c90773053

Change-Id: I75af57c064120e3bb6ed6e55c6bb0058d964020a
 2018-03-09 06:20:39 +00:00
Tarandeep Singh
5e3d9f5101 Merge "Remove debug metadata isVrOnly from InputMethodInfo" into pi-dev 
am: 961e147b66

Change-Id: I0554b89a05a528178329874a8afa1f5cdc10a58b
 2018-03-09 06:15:31 +00:00
Tarandeep Singh
7dba49739b Merge "Make few of the new IMS API methods final" into pi-dev 
am: 8e64eee8dc

Change-Id: Iba222fe7e0752b7161e82b77d28dbe636f1bca7a
 2018-03-09 06:10:43 +00:00
Changwan Ryu
dd6ec01ece Merge "Expose WebView#onCheckIsTextEditor" into pi-dev 
am: ebe856a90e

Change-Id: I1aa2c3d27c4b11248451aec3723d4eeef8bdbb90
 2018-03-09 06:05:45 +00:00
Yi Jin
7406b66072 Merge "Optimize incidentd memory usage" into pi-dev 
am: 12fa6b4ff6

Change-Id: I6ccbb8675002c93c3894220d12597d6fc4c63153
 2018-03-09 06:00:51 +00:00
yro
ec01ab9e68 Merge "Write data to file when StatsCompanionSerivice (system_server) crashes" into pi-dev 
am: ec66e9e726

Change-Id: Ia283c7058e7f5a0e6935d1b1dea38a8e3d59d775
 2018-03-09 05:55:57 +00:00
Fyodor Kupolov
fd6dd3848a Merge "Merge changes from topic "am-74e79eb6-59c1-4f9c-a993-72eeee3859c4" into oc-dev am: b6b6c01847 am: bdc573b39b am: d258da6a80" into pi-dev 
am: 0aa191ccbf

Change-Id: I6e20bd7cb9a86305a1c052ecb6d139e35ed803ca
 2018-03-09 05:50:54 +00:00
Amin Shaikh
96e99cbc8d Merge "Add secondary text to mobile data tile." into pi-dev 
am: 24d888aab6

Change-Id: Ic9abbff2accf84a2b3d9095f2615cf92252cdb65
 2018-03-09 05:25:36 +00:00
Rohan Shah
d0e848930e Merge "[QS] Disable hotspot when data saver is enabled" into pi-dev 
am: 92078d34fb

Change-Id: I50a0ef8e7dfcf3127fb4b68fd7f0093a726d36e9
 2018-03-09 05:20:37 +00:00
TreeHugger Robot
df9737d286 Merge "Documenting some core proto style conventions." into pi-dev 2018-03-09 05:15:28 +00:00
TreeHugger Robot
e8b15263e0 Merge "Marked testFocusedWindowMultipleDisplays as flaky" into pi-dev 2018-03-09 05:13:22 +00:00
Hyundo Moon
c896d9d7e6 MediaSession2: Ensure NonNull/Nullable for parameters of public methods 
Bug: 73863865
Test: runtest-MediaComponents
Change-Id: Id40f221ae60b1e63afd9ff71950589fe13a7f526
 2018-03-09 14:00:11 +09:00
Erik Kline
59787b4247 Merge "Add BaseNetdEventCallback class that provides no-op implementations for INetdEventCallback." 2018-03-09 04:49:51 +00:00
TreeHugger Robot
790a31ee31 Merge "MediaSession2: Implement MediaSession2#updatePlayer()" into pi-dev 2018-03-09 04:37:29 +00:00