Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
468,716 Commits 3 Branches 0 Tags
4ceb91420269e60b8bc69a7811c74b3824ecd570
Commit Graph

468716 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
4ceb914202 Merge "media: fix MediaCodecTest#testException" into rvc-dev am: c5162ed949 
Change-Id: I614e0c371e89de3ab3be1f36cae3e180e28bc992
 2020-02-25 18:32:48 +00:00
Automerger Merge Worker
3c642347c5 Merge "Add @NonNull annotation per API Council's suggestion" into rvc-dev am: 282b5c2043 
Change-Id: I1e973f3f484967234cf24fecbda06fd1df50c15b
 2020-02-25 18:32:19 +00:00
Automerger Merge Worker
f0e36ac714 Merge "Fix Display SurfaceControl leak" into rvc-dev am: 87293fda8d 
Change-Id: Id022aed80b4c459db61d3fc8e9a0066c73e95e28
 2020-02-25 18:31:41 +00:00
Automerger Merge Worker
f84af9e79a Merge "Clear registered prediction callbacks on destroy" into rvc-dev am: 086e11fdb6 
Change-Id: I0203e3f8132264634caa89c02b38c004ee7aab11
 2020-02-25 18:31:05 +00:00
TreeHugger Robot
c5162ed949 Merge "media: fix MediaCodecTest#testException" into rvc-dev 2020-02-25 18:21:19 +00:00
Amy Zhang
282b5c2043 Merge "Add @NonNull annotation per API Council's suggestion" into rvc-dev 2020-02-25 18:16:49 +00:00
Chavi Weingarten
87293fda8d Merge "Fix Display SurfaceControl leak" into rvc-dev 2020-02-25 18:11:54 +00:00
Samuel Fufa
086e11fdb6 Merge "Clear registered prediction callbacks on destroy" into rvc-dev 2020-02-25 18:08:32 +00:00
Automerger Merge Worker
88ae935233 [automerger skipped] Merge "DO NOT MERGE Hold onto NotificationListener when reconnecting notifications UI." into qt-qpr1-dev am: b896072638 -s ours am: c644bff0c2 
Change-Id: I468f7b0ec71699e61343f6f71afcf14fa98cad9e
 2020-02-25 17:53:17 +00:00
Automerger Merge Worker
e2de88b6a4 Merge "Updating documentation for isDefaultApplicationIcon API" into rvc-dev am: 9962f03b77 
Change-Id: Ifbe668bcc0a6a15155786927a944451f4935873d
 2020-02-25 17:53:10 +00:00
Automerger Merge Worker
a272084d17 Merge "Set default for controls as enabled." into rvc-dev am: c6616838c3 
Change-Id: Iaea61aab1ce03ec398812e8cca18187995929672
 2020-02-25 17:52:23 +00:00
Automerger Merge Worker
c644bff0c2 [automerger skipped] Merge "DO NOT MERGE Hold onto NotificationListener when reconnecting notifications UI." into qt-qpr1-dev am: b896072638 -s ours 
am skip reason: subject contains skip directive

Change-Id: I45d10cb78a32e891fc3fcd05b6b5232ba7762457
 2020-02-25 17:51:59 +00:00
Sunny Goyal
9962f03b77 Merge "Updating documentation for isDefaultApplicationIcon API" into rvc-dev 2020-02-25 17:46:23 +00:00
Fabian Kozynski
c6616838c3 Merge "Set default for controls as enabled." into rvc-dev 2020-02-25 17:40:14 +00:00
Eric Berglund
b896072638 Merge "DO NOT MERGE Hold onto NotificationListener when reconnecting notifications UI." into qt-qpr1-dev 2020-02-25 17:37:15 +00:00
Automerger Merge Worker
dbd864753e Merge "Fix the delay time for Assistant" into rvc-dev am: 2ae4ec02f9 
Change-Id: I4449e8e3e60881213dd1305ade605f416096b8cc
 2020-02-25 17:29:21 +00:00
Santhosh Thangaraj
2ae4ec02f9 Merge "Fix the delay time for Assistant" into rvc-dev 2020-02-25 17:26:10 +00:00
Automerger Merge Worker
cc43fed514 Merge "Migrate QS_EDIT metrics to WW" into rvc-dev am: 8014ffec99 
Change-Id: I70091b67c4358779fc1481b73463bc4bcbff8f33
 2020-02-25 17:24:19 +00:00
Fabian Kozynski
8014ffec99 Merge "Migrate QS_EDIT metrics to WW" into rvc-dev 2020-02-25 17:11:27 +00:00
Automerger Merge Worker
062ecb1f48 Merge "Grants visibility on uri permission grant" into rvc-dev am: cb2d2ec786 
Change-Id: Id06d43ad58053fe0068310429d004b4ea5399a02
 2020-02-25 15:58:23 +00:00
Automerger Merge Worker
366b8a2245 Merge "Disable caches for perf tests" into rvc-dev am: 667af98d38 
Change-Id: I0a151d7e6806c80474008ac078d4cfb20cfb9c83
 2020-02-25 15:57:53 +00:00
Patrick Baumann
cb2d2ec786 Merge "Grants visibility on uri permission grant" into rvc-dev 2020-02-25 15:52:29 +00:00
Patrick Baumann
710d720db7 Grants visibility on uri permission grant 
When permission is granted to another app via URI, we implicitly grant
visibility to that app of the app ID that that URI resolves to.

Test: atest AppSecurityTests
Fixes: 149781706
Fixes: 145677500
Exempt-From-Owner-Approval: Owner approved prior to cherry-pick
Change-Id: I7c8967a4464fd821e4f95d8eb6c0bcfadadb912e
 2020-02-25 15:48:30 +00:00
Patrick Baumann
667af98d38 Merge "Disable caches for perf tests" into rvc-dev 2020-02-25 15:45:32 +00:00
Fabian Kozynski
0424ab1416 Set default for controls as enabled. 
From this CL onwards, the default for controls is enabled (still not a
Setting).

The controls section in power menu and the new layout will only be used
if there's at least one app that can provide controls.

Test: manual
Bug: 149992619
Change-Id: I4e78735d642d24fe0080a0f0f4cbc58ffa2d5a94
 2020-02-25 10:41:14 -05:00
Automerger Merge Worker
f20e0ee6c5 Merge "Squash same ApplicationInfo's in Parcel" into rvc-dev am: 9577cd78ff 
Change-Id: I4d06b09676409da4353e9e742786648736ca5738
 2020-02-25 15:20:18 +00:00
Makoto Onuki
9577cd78ff Merge "Squash same ApplicationInfo's in Parcel" into rvc-dev 2020-02-25 15:17:14 +00:00
Automerger Merge Worker
b42d60fd69 Merge "Build framework-tethering against module_current" into rvc-dev am: aba5f0ca29 
Change-Id: I9e44db3045766b22f42362cbc4c44a5d9a204345
 2020-02-25 15:14:59 +00:00
TreeHugger Robot
aba5f0ca29 Merge "Build framework-tethering against module_current" into rvc-dev 2020-02-25 15:09:16 +00:00
Automerger Merge Worker
87dc3624f1 Merge "Increase avatar and sender name sizes in MessagingStyle" into rvc-dev am: 7b27da1d8f 
Change-Id: I73d52d04c41477b800168060c483d695d218ff06
 2020-02-25 15:08:13 +00:00
Automerger Merge Worker
d4c1501722 Merge "Fix important person notification ranking test" into rvc-dev am: ae97b108aa 
Change-Id: I565c6f29983ab6333e464af05168ffb7d48a6852
 2020-02-25 15:07:21 +00:00
Steve Elliott
7b27da1d8f Merge "Increase avatar and sender name sizes in MessagingStyle" into rvc-dev 2020-02-25 14:59:13 +00:00
Steve Elliott
ae97b108aa Merge "Fix important person notification ranking test" into rvc-dev 2020-02-25 14:57:06 +00:00
Fabian Kozynski
6a8d9415f2 Migrate QS_EDIT metrics to WW 
This migrates the previous Tron events into Westworld. Now we only log
the spec/package for each tile, not the position.

The position in most cases is not interesting as it can be obtained from
other places (in the future, lift this info from QSTileHost for
example).

Fixes: 147508828
Test: manual using statsd_testdrive
Change-Id: I7b27a31b303d6ebe894041433fbf9d81e57a9f3c
 2020-02-25 09:30:28 -05:00
Automerger Merge Worker
f08ba60985 Merge "Use KeyguardStateController in GlobalActionsDialog" into rvc-dev am: 26e248664d 
Change-Id: I559423f49ff1bc7a2ce4f31e73886d3df3dc5faa
 2020-02-25 14:18:45 +00:00
Fabian Kozynski
26e248664d Merge "Use KeyguardStateController in GlobalActionsDialog" into rvc-dev 2020-02-25 14:07:51 +00:00
Automerger Merge Worker
ebe4eedfdd Merge "Revert "Add WTF when a system server wrapper can't be found"" into rvc-dev am: 6d81a5f569 
Change-Id: I0c29f0a436f8fd817f0c5c34d134c081401e1b99
 2020-02-25 13:04:41 +00:00
Makoto Onuki
6d81a5f569 Merge "Revert "Add WTF when a system server wrapper can't be found"" into rvc-dev 2020-02-25 12:53:58 +00:00
Zhuoyao Zhang
3495b81006 Revert "Add WTF when a system server wrapper can't be found" 
This reverts commit 2cddb8a891.

Reason for revert: break app compat test b/149923038

Bug: 149923038
Change-Id: Ibace06f704595d40a4439c0bdfea55d11294ba77
 2020-02-25 12:53:29 +00:00
Automerger Merge Worker
dd66516fe9 Create DreamManager System Server TestApi am: 641e2e6361 
Change-Id: I84802d802d2419223dd3f54f1d57bf98a7a9c685
 2020-02-25 12:41:30 +00:00
Galia Peycheva
641e2e6361 Create DreamManager System Server TestApi 
Bug: 141771803
Bug: 133216167

Test: atest DreamManagerServiceTests
Test: make checkbuild

Merged-In: I937061138bc8ccaf4475674f00331c3fe1c5a495
Change-Id: I937061138bc8ccaf4475674f00331c3fe1c5a495
(cherry picked from commit 4467c53c11)
 2020-02-25 12:32:02 +00:00
Automerger Merge Worker
9138b8deab Merge "reduce the visibility of framework-minus-apex" into rvc-dev am: e06e29bb09 
Change-Id: Ie96980047f6f9f9c1d5d3f0784b6f59b2ed22c84
 2020-02-25 11:44:46 +00:00
TreeHugger Robot
e06e29bb09 Merge "reduce the visibility of framework-minus-apex" into rvc-dev 2020-02-25 11:33:44 +00:00
Automerger Merge Worker
183986e0a9 Merge changes Id71b4cbc,I8dff0a12,Ife3d1390 into rvc-dev am: a72d7e53e6 
Change-Id: I9acb6efd6324b8e7b4ae6bc74fdb6287199ed911
 2020-02-25 10:24:53 +00:00
Automerger Merge Worker
d5c8310562 Make DreamService use an Activity am: 6861e91b84 
Change-Id: Ia244d76ed0fc3eb38860cd0bd6af90e0d4ea7bf6
 2020-02-25 10:24:44 +00:00
Automerger Merge Worker
6c2ed35774 Clean up dreamland am: a8e4641296 
Change-Id: I72a2a845db0d5488ac5532917be429bb5095184e
 2020-02-25 10:24:38 +00:00
Galia Peycheva
a72d7e53e6 Merge changes Id71b4cbc,I8dff0a12,Ife3d1390 into rvc-dev 
* changes:
  Add startDreamActivity request verification
  Make DreamService use an Activity
  Clean up dreamland
 2020-02-25 10:11:21 +00:00
Automerger Merge Worker
36d955d28f Merge "Add API docs for permission SECURE_ELEMENT_PRIVILEGED" into rvc-dev am: 61b8ac42c3 
Change-Id: I50a56e9b2ba35cff514f0632c2df7dab5c719497
 2020-02-25 09:56:18 +00:00
Automerger Merge Worker
561564dfd4 Build framework-tethering against module_current 
Bug: 146757305
Test: build

Change-Id: Id6051296a02060179666b67fc6ea9092273c1780
Merged-In: Id6051296a02060179666b67fc6ea9092273c1780
Merged-In: Iad504f0e709daadfb4d86205c07f0faf429f5a8f
(cherry picked from commit bb09ceaf09)
 2020-02-25 09:47:25 +00:00
George Chang
61b8ac42c3 Merge "Add API docs for permission SECURE_ELEMENT_PRIVILEGED" into rvc-dev 2020-02-25 09:42:23 +00:00