Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
471,877 Commits 3 Branches 0 Tags
bc95628e5a9c91017cc83da484a71244a116f795
Commit Graph

471877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
bc95628e5a Merge "Merge "Support settings activity for accessibility shortcut target" into rvc-dev am: 6820d68e25 am: 218fb98760" into rvc-d1-dev-plus-aosp 2020-03-04 12:49:24 +00:00
Automerger Merge Worker
2a14fd7d48 Merge "Support settings activity for accessibility shortcut target" into rvc-dev am: 6820d68e25 am: 218fb98760 
Change-Id: Ic0d1db944366e4b07645126ce047c296ba742753
 2020-03-04 12:49:12 +00:00
Automerger Merge Worker
61deb0ea2d Merge "Support settings activity for accessibility shortcut target" into rvc-dev am: 6820d68e25 am: d89ae0f56d 
Change-Id: Ic1d37d5566880c012fe0a28a12339d39a2bc4c23
 2020-03-04 12:49:11 +00:00
Automerger Merge Worker
218fb98760 Merge "Support settings activity for accessibility shortcut target" into rvc-dev am: 6820d68e25 
Change-Id: I0dec303c9db9058e8f879f5cd6764ab1c3f8d5d0
 2020-03-04 12:32:12 +00:00
Automerger Merge Worker
d89ae0f56d Merge "Support settings activity for accessibility shortcut target" into rvc-dev am: 6820d68e25 
Change-Id: I6665850ebb915c7e74d74cc44521a9e61cfb2383
 2020-03-04 12:31:56 +00:00
Jason Hsu
6820d68e25 Merge "Support settings activity for accessibility shortcut target" into rvc-dev 2020-03-04 12:13:42 +00:00
Automerger Merge Worker
0b2a3a1e60 Merge "Merge "Treat playlists like first class media files" into rvc-dev am: d021b2851a am: b58c1d714a" into rvc-d1-dev-plus-aosp 2020-03-04 11:48:36 +00:00
Automerger Merge Worker
ef9f5710fe Merge "Treat playlists like first class media files" into rvc-dev am: d021b2851a am: b58c1d714a 
Change-Id: If1823357e9cc0bc0d9b4c35d11000f8f98d829c4
 2020-03-04 11:48:26 +00:00
Automerger Merge Worker
fff25f9c44 Merge "Treat playlists like first class media files" into rvc-dev am: d021b2851a am: 26ff7b9cd3 
Change-Id: I5e4b0d26d31fa339d3d72cfeafa97959d6bbfeb8
 2020-03-04 11:48:22 +00:00
Automerger Merge Worker
26ff7b9cd3 Merge "Treat playlists like first class media files" into rvc-dev am: d021b2851a 
Change-Id: Ie33ed71530c70e5b8abb22eae204ff5edc1561bd
 2020-03-04 11:32:40 +00:00
Automerger Merge Worker
b58c1d714a Merge "Treat playlists like first class media files" into rvc-dev am: d021b2851a 
Change-Id: I5ed1a99393fe6714d6614613675a44c17377d74a
 2020-03-04 11:32:34 +00:00
Shafik Nassar
d021b2851a Merge "Treat playlists like first class media files" into rvc-dev 2020-03-04 11:14:00 +00:00
Automerger Merge Worker
cb2274c63d Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" am: 63e5bd6b4b am: 21f010984f am: 305ecb9aff 
Change-Id: I4a136c90efcbea371a0e4b720c1a54584c52eefe
 2020-03-04 11:08:25 +00:00
Automerger Merge Worker
305ecb9aff Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" am: 63e5bd6b4b am: 21f010984f 
Change-Id: Ifb0b5b9742a9a4c0c4c1845c647184d65cff8e4f
 2020-03-04 10:50:48 +00:00
Automerger Merge Worker
21f010984f Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" am: 63e5bd6b4b 
Change-Id: I1ab6d47c17992f8630d9aba892bcef29dcb66bfa
 2020-03-04 10:32:09 +00:00
Paul Hu
63e5bd6b4b Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" 2020-03-04 10:15:41 +00:00
Automerger Merge Worker
2858bacf14 Merge "Merge "Remove blocking binder calls from system server" am: b7eb7b3579 am: 78d96ec2af" into rvc-dev-plus-aosp am: db48dbe48c 
Change-Id: I86ac9fb036e6b82eabd4035afd86901ba9b32b86
 2020-03-04 10:03:44 +00:00
Automerger Merge Worker
3e2e95a62d Merge "Revert "[Media ML] Add button session management related classes"" into rvc-dev am: 628f8bc353 am: de70e4e30b 
Change-Id: Ia62629b79657068e003d5b0027cd225ea0cf2d94
 2020-03-04 10:03:07 +00:00
Automerger Merge Worker
4d4a42347f Merge "Revert "[Media ML] Add button session management related classes"" into rvc-dev am: 628f8bc353 am: dd1eac6a6c 
Change-Id: Ie502e7ab4acb04afb012e176beb05d945e3e6e73
 2020-03-04 09:56:05 +00:00
Automerger Merge Worker
db48dbe48c Merge "Merge "Remove blocking binder calls from system server" am: b7eb7b3579 am: 78d96ec2af" into rvc-dev-plus-aosp 2020-03-04 09:46:21 +00:00
Automerger Merge Worker
6dc74262d4 Merge "Remove blocking binder calls from system server" am: b7eb7b3579 am: 78d96ec2af 
Change-Id: I8154bb28684ba9f671884f88a20e6199c7c26957
 2020-03-04 09:46:07 +00:00
Automerger Merge Worker
dd1eac6a6c Merge "Revert "[Media ML] Add button session management related classes"" into rvc-dev am: 628f8bc353 
Change-Id: I22b7f39d526f7c8a347ccc04c339f6121290a00f
 2020-03-04 09:45:59 +00:00
Automerger Merge Worker
de70e4e30b Merge "Revert "[Media ML] Add button session management related classes"" into rvc-dev am: 628f8bc353 
Change-Id: Ie9dc88ffac65044ff9afbcf09968858a8e170233
 2020-03-04 09:45:57 +00:00
Automerger Merge Worker
78d96ec2af Merge "Remove blocking binder calls from system server" am: b7eb7b3579 
Change-Id: I02ea1836a54fb33c42f19fde593b39378c979be5
 2020-03-04 09:34:58 +00:00
Jin Seok Park
628f8bc353 Merge "Revert "[Media ML] Add button session management related classes"" into rvc-dev 2020-03-04 09:31:04 +00:00
Jin Seok Park
4708f932b7 Revert "[Media ML] Add button session management related classes" 
This reverts commit 03f4279d38.

Reason for revert: Commit without code change

Bug: 147027868
Change-Id: I17e0ef63bca4893faab5bbe78f199174abb49db6
 2020-03-04 09:30:44 +00:00
Automerger Merge Worker
081b3cf9c3 Merge "Disable auto time zone on non-telephony devices" am: 2edc5306da am: d14160c658 am: 7c93c7bf34 
Change-Id: I5cbe2d10644ed0390c12123140e67abebdf9cb68
 2020-03-04 09:27:24 +00:00
Howard Chen
b7eb7b3579 Merge "Remove blocking binder calls from system server" 2020-03-04 09:16:47 +00:00
Automerger Merge Worker
7c93c7bf34 Merge "Disable auto time zone on non-telephony devices" am: 2edc5306da am: d14160c658 
Change-Id: Ib870fb2970460ca60a11d54bdbdaa045f9c28f84
 2020-03-04 09:08:15 +00:00
Automerger Merge Worker
d14160c658 Merge "Disable auto time zone on non-telephony devices" am: 2edc5306da 
Change-Id: I09afa6bd32b533dc43aab15b9eb77e4335d3c498
 2020-03-04 08:50:20 +00:00
Neil Fuller
2edc5306da Merge "Disable auto time zone on non-telephony devices" 2020-03-04 08:28:33 +00:00
Automerger Merge Worker
b690265c6a Merge "[Media ML] Add button session management related classes" into rvc-dev am: 82b4074d55 am: 0500947397 
Change-Id: Iccaac18589341ac55f5118feaece6f97baf98cf3
 2020-03-04 07:52:57 +00:00
Automerger Merge Worker
5f347ce72b Merge "[Media ML] Add button session management related classes" into rvc-dev am: 82b4074d55 am: 860ef6fbb8 
Change-Id: Iaeef8664510b89eceb9c664dc094bea0f74bf53b
 2020-03-04 07:52:44 +00:00
Automerger Merge Worker
0500947397 Merge "[Media ML] Add button session management related classes" into rvc-dev am: 82b4074d55 
Change-Id: Ib36ddd15ddd4c4132891112b78b130f79ca80773
 2020-03-04 07:33:56 +00:00
Automerger Merge Worker
860ef6fbb8 Merge "[Media ML] Add button session management related classes" into rvc-dev am: 82b4074d55 
Change-Id: I3eff8018b54aaf73126afdb56af5e94c160fc443
 2020-03-04 07:33:40 +00:00
Automerger Merge Worker
6835512ed9 Merge "[automerger skipped] Create different KeyId for saved and suggestion network am: 96a9e48520 -s ours am: 8b4dbede57 -s ours am: 89da30263d -s ours am skip reason: Change-Id I31ee6f3a3295aca0bd7fcb83ce74327922977797 with SHA-1 758606219f is in history" into rvc-d1-dev-plus-aosp 2020-03-04 07:25:28 +00:00
Automerger Merge Worker
5d6a950022 [automerger skipped] Create different KeyId for saved and suggestion network am: 96a9e48520 -s ours am: 8b4dbede57 -s ours am: 89da30263d -s ours 
am skip reason: Change-Id I31ee6f3a3295aca0bd7fcb83ce74327922977797 with SHA-1 758606219f is in history

Change-Id: Ifc01d272cbf79f5c91063884742b5376a3e23981
 2020-03-04 07:25:24 +00:00
Automerger Merge Worker
760a6a6e80 [automerger skipped] Create different KeyId for saved and suggestion network am: 96a9e48520 -s ours am: 8b4dbede57 -s ours am: 09df2d55ba -s ours 
am skip reason: Change-Id I31ee6f3a3295aca0bd7fcb83ce74327922977797 with SHA-1 758606219f is in history

Change-Id: Ia27453c3822a04d3b196aaedd8c547c3c6a2cac2
 2020-03-04 07:25:21 +00:00
Jin Seok Park
82b4074d55 Merge "[Media ML] Add button session management related classes" into rvc-dev 2020-03-04 07:18:41 +00:00
Automerger Merge Worker
09df2d55ba [automerger skipped] Create different KeyId for saved and suggestion network am: 96a9e48520 -s ours am: 8b4dbede57 -s ours 
am skip reason: Change-Id I31ee6f3a3295aca0bd7fcb83ce74327922977797 with SHA-1 758606219f is in history

Change-Id: Ica9a894ad5b0f62ff6051ae5c6b482b63537a7dc
 2020-03-04 07:04:12 +00:00
Automerger Merge Worker
89da30263d [automerger skipped] Create different KeyId for saved and suggestion network am: 96a9e48520 -s ours am: 8b4dbede57 -s ours 
am skip reason: Change-Id I31ee6f3a3295aca0bd7fcb83ce74327922977797 with SHA-1 758606219f is in history

Change-Id: I67607bbecbf2ffcb5ab2dd0ed5ff5f8a63c893c2
 2020-03-04 07:03:56 +00:00
Jin Seok Park
03f4279d38 [Media ML] Add button session management related classes 
This CL creates hidden MediaKeyDispatcher and SessionPolicyProvider
classes that OEMs can implement/override to customize button session
management. Implementation code inside MediaSessionService will
follow in the next CL.

Bug: 147027868
Test: build
Change-Id: Ie3d0c558c4a5f04d27411f6f36e9f5c3a6aea3d0
 2020-03-04 15:54:50 +09:00
Automerger Merge Worker
8b4dbede57 [automerger skipped] Create different KeyId for saved and suggestion network am: 96a9e48520 -s ours 
am skip reason: Change-Id I31ee6f3a3295aca0bd7fcb83ce74327922977797 with SHA-1 758606219f is in history

Change-Id: Ieba6f54ff4cf21bb0e92887b033d98efa16fc9d8
 2020-03-04 06:47:44 +00:00
Automerger Merge Worker
7cd5975424 [automerger skipped] Merge "Move DnsSdTxtRecord to net common static library" am: 8d6a6e0d4b am: 465199b9a0 -s ours am: 09cf091a6a -s ours 
am skip reason: Change-Id I6118b313ce668707d598aa2eab9baee2f7622dbc with SHA-1 3587754f22 is in history

Change-Id: I56f0499b19f2bf11d8f3e5f419753323efe476c9
 2020-03-04 06:21:08 +00:00
Automerger Merge Worker
ad2643e6bb Merge "Fix race condition" into rvc-dev am: 3f634b45e1 am: 0faf16cd31 
Change-Id: I70e81b50d48fdf08a2f97334bf6fae5b6d538a92
 2020-03-04 06:20:51 +00:00
Automerger Merge Worker
79f0e944ed Merge "Fix race condition" into rvc-dev am: 3f634b45e1 am: 3939060ace 
Change-Id: I7c87396d993e1861e22c0b6a1e60cfb083d86c80
 2020-03-04 06:14:38 +00:00
Automerger Merge Worker
09cf091a6a [automerger skipped] Merge "Move DnsSdTxtRecord to net common static library" am: 8d6a6e0d4b am: 465199b9a0 -s ours 
am skip reason: Change-Id I6118b313ce668707d598aa2eab9baee2f7622dbc with SHA-1 3587754f22 is in history

Change-Id: I678c69314756955e3b6182ab6b25ba7395bedd97
 2020-03-04 06:09:52 +00:00
Automerger Merge Worker
0faf16cd31 Merge "Fix race condition" into rvc-dev am: 3f634b45e1 
Change-Id: I90ba8770728c76460bff246e7d8f235006a25ef5
 2020-03-04 06:05:56 +00:00
Automerger Merge Worker
3939060ace Merge "Fix race condition" into rvc-dev am: 3f634b45e1 
Change-Id: I793407405110512ba39ff483b9a544e57a6ce6cf
 2020-03-04 06:05:32 +00:00
Automerger Merge Worker
485a19f0e6 Merge "Merge "libincfs and libdataloader headers not using std::span" into rvc-dev am: 2c3f5d24ce am: 89f35ee572" into rvc-d1-dev-plus-aosp 2020-03-04 05:58:00 +00:00