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

468775 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
3dfeb34e67 Merge "Add @NonNull annotation per API Council's suggestion" into rvc-dev am: 282b5c2043 am: 3c642347c5 
Change-Id: Ibd54891b6e5aa6d9d2f368d6f4bc17684c299fa9
 2020-02-25 18:47:31 +00:00
Automerger Merge Worker
1c20f13d88 Merge "Fix Display SurfaceControl leak" into rvc-dev am: 87293fda8d am: f0e36ac714 
Change-Id: Ie35241fd2ee76a22356eeee743bead6de9b6cf3e
 2020-02-25 18:47:09 +00:00
Automerger Merge Worker
d5f9d837bc Merge "Clear registered prediction callbacks on destroy" into rvc-dev am: 086e11fdb6 am: f84af9e79a 
Change-Id: I497af5c210d4fcfa6bc4b9c346443c24f6ad0277
 2020-02-25 18:46:41 +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
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
6d4c677e67 [automerger skipped] Merge "DO NOT MERGE Hold onto NotificationListener when reconnecting notifications UI." into qt-qpr1-dev am: b896072638 -s ours am: c644bff0c2 am: 88ae935233 
Change-Id: I06c6f5b688e5b1ecce4a6803c3159177a1d84a4a
 2020-02-25 18:04:26 +00:00
Automerger Merge Worker
b8655e302a Merge "Updating documentation for isDefaultApplicationIcon API" into rvc-dev am: 9962f03b77 am: e2de88b6a4 
Change-Id: I8dbfee2c45dab6ba8ad2a23833a4423bf9b9b592
 2020-02-25 18:04:21 +00:00
Automerger Merge Worker
072789227f Merge "Set default for controls as enabled." into rvc-dev am: c6616838c3 am: a272084d17 
Change-Id: I62c8af1b8b3ed7c0b887a10488adac55694fcf9e
 2020-02-25 18:04:04 +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
f98b57eea8 Merge "Fix the delay time for Assistant" into rvc-dev am: 2ae4ec02f9 am: dbd864753e 
Change-Id: I319a83be460941db501027f2dc4dc2c797ab1830
 2020-02-25 17:34:38 +00:00
Automerger Merge Worker
20acf99765 Merge "Migrate QS_EDIT metrics to WW" into rvc-dev am: 8014ffec99 am: cc43fed514 
Change-Id: I46416931098dd30528754c63fdf9c92353da9fda
 2020-02-25 17:34:32 +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
e86eb718c6 Merge "Grants visibility on uri permission grant" into rvc-dev am: cb2d2ec786 am: 062ecb1f48 
Change-Id: Ie52beab8e99bf9b7b53c7d0d079bf69b174fe1d6
 2020-02-25 16:11:51 +00:00
Automerger Merge Worker
92e4fae5ec Merge "Disable caches for perf tests" into rvc-dev am: 667af98d38 am: 366b8a2245 
Change-Id: I88087e720779f2371d0a7ccdd8e26a5109505f7a
 2020-02-25 16:11:43 +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
f7336e550c Merge "Squash same ApplicationInfo's in Parcel" into rvc-dev am: 9577cd78ff am: f20e0ee6c5 
Change-Id: I7cd177f854cae7b73b4ee46aca6fd83488009dde
 2020-02-25 15:21:10 +00:00
Automerger Merge Worker
b51bef45bb Merge "Build framework-tethering against module_current" into rvc-dev am: aba5f0ca29 am: b42d60fd69 
Change-Id: I50bf3a9c94f9808742fef10e380479cd474a7b16
 2020-02-25 15:21:03 +00:00
Automerger Merge Worker
df06209968 Merge "Increase avatar and sender name sizes in MessagingStyle" into rvc-dev am: 7b27da1d8f am: 87dc3624f1 
Change-Id: I2eca379d356430c23837ec8d0bca93eebe72c899
 2020-02-25 15:20:48 +00:00
Automerger Merge Worker
359e056cc2 Merge "Fix important person notification ranking test" into rvc-dev am: ae97b108aa am: d4c1501722 
Change-Id: I846f8476c95c7c6c7dc817aa2e9e4246a0357f27
 2020-02-25 15:20:21 +00: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
4a0d200608 Merge "Use KeyguardStateController in GlobalActionsDialog" into rvc-dev am: 26e248664d am: f08ba60985 
Change-Id: I93692362821f3d3fb1d4928fb1fe2c9679bcacc1
 2020-02-25 14:29:25 +00: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
3670acf9c3 Merge "Revert "Add WTF when a system server wrapper can't be found"" into rvc-dev am: 6d81a5f569 am: ebe4eedfdd 
Change-Id: If5dd119426d26383d5d68a6f44a08468f94fa0cf
 2020-02-25 13:15:01 +00:00