Commit Graph

659924 Commits

Author SHA1 Message Date
Erik Wolsheimer
11d471fe33 Merge "Add application-level 'attributionsAreUserVisible' attribute" into sc-dev am: dba8fda0b3 am: e726e33c83 am: 6c705310a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14591918

Change-Id: I56ed0f338b4ed074be961ac768f785ee3c51c241
2021-05-21 01:08:25 +00:00
Jing Ji
d030192138 Merge "Reset common association source while resetting procstats associations" into sc-dev am: dec2e2169e am: 3154bb657b am: 84a074db36
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14554723

Change-Id: I108d585c792dbcca5094f2d432c66fab1b07c473
2021-05-21 01:07:11 +00:00
TreeHugger Robot
ad135e408f Merge "Add OPSTR_PHONE_CALL_* op strings to System API" into sc-dev am: c7e659afd0 am: caa9b99f8e am: 9d227d66c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14664156

Change-Id: Iae844013bff95fed2499bbb84dd5e0f58c96a1df
2021-05-21 01:06:09 +00:00
Erik Wolsheimer
6c705310a9 Merge "Add application-level 'attributionsAreUserVisible' attribute" into sc-dev am: dba8fda0b3 am: e726e33c83
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14591918

Change-Id: If70b2cd801500659dae2d01e57e474b1fd5cf8cc
2021-05-21 00:50:07 +00:00
Jing Ji
84a074db36 Merge "Reset common association source while resetting procstats associations" into sc-dev am: dec2e2169e am: 3154bb657b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14554723

Change-Id: I196a7cb607ab90529db044ba1ea7ca12452d1cdb
2021-05-21 00:49:45 +00:00
TreeHugger Robot
9d227d66c8 Merge "Add OPSTR_PHONE_CALL_* op strings to System API" into sc-dev am: c7e659afd0 am: caa9b99f8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14664156

Change-Id: I8ac69c899a4fb219adedb22a2d3044cf14d91e3b
2021-05-21 00:48:45 +00:00
Erik Wolsheimer
e726e33c83 Merge "Add application-level 'attributionsAreUserVisible' attribute" into sc-dev am: dba8fda0b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14591918

Change-Id: I4743576d22ea946f8ab5ae582f330f340c9b84e1
2021-05-21 00:36:01 +00:00
Jing Ji
3154bb657b Merge "Reset common association source while resetting procstats associations" into sc-dev am: dec2e2169e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14554723

Change-Id: I9d4d0cf65bbb831e441405bd6a02b15dfd57ea5a
2021-05-21 00:35:41 +00:00
TreeHugger Robot
caa9b99f8e Merge "Add OPSTR_PHONE_CALL_* op strings to System API" into sc-dev am: c7e659afd0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14664156

Change-Id: Ia814a99f759ef6dc4266f0bb09dcf56f75d64481
2021-05-21 00:35:18 +00:00
Jeff Sharkey
e6e9c690d6 Merge "Relax ACTION_TETHERING_STATE_CHANGED permissions." into sc-dev am: 6e8cafb843 am: 6f0a287baf am: 134037f517
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14666177

Change-Id: I9fd7350ef467731e413f06ff618db354905e5787
2021-05-21 00:34:18 +00:00
Jeff Sharkey
20cd0d1e31 Merge "Relax ACTION_TETHERING_STATE_CHANGED permissions." into sc-dev am: 6e8cafb843 am: 1abe9e5ddc am: 6c629f3444
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14666177

Change-Id: Ie93aa3efbcdb8f8131d5371a3a50d758a779fe11
2021-05-21 00:33:32 +00:00
Erik Wolsheimer
dba8fda0b3 Merge "Add application-level 'attributionsAreUserVisible' attribute" into sc-dev 2021-05-21 00:23:28 +00:00
Jing Ji
dec2e2169e Merge "Reset common association source while resetting procstats associations" into sc-dev 2021-05-21 00:18:14 +00:00
Jeff Sharkey
134037f517 Merge "Relax ACTION_TETHERING_STATE_CHANGED permissions." into sc-dev am: 6e8cafb843 am: 6f0a287baf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14666177

Change-Id: If4ec3ba588d08e003aa0b21a5d4667aecb90ffcd
2021-05-21 00:15:29 +00:00
Jeff Sharkey
6c629f3444 Merge "Relax ACTION_TETHERING_STATE_CHANGED permissions." into sc-dev am: 6e8cafb843 am: 1abe9e5ddc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14666177

Change-Id: If3e72177896d1e59d53ba2a12077458a55332243
2021-05-21 00:13:36 +00:00
TreeHugger Robot
c7e659afd0 Merge "Add OPSTR_PHONE_CALL_* op strings to System API" into sc-dev 2021-05-21 00:11:49 +00:00
Ryan Mitchell
7908a8a3e8 Merge "Do not call pop_back when app has no uses-sdk" into sc-dev am: 47e58f1238 am: d7399e7154 am: 01898a5e9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14664167

Change-Id: Icb38beae462813915c9efa3581b9b4620f67b4c4
2021-05-21 00:04:28 +00:00
Tom Natan
5c8bf31530 Merge "Rename addPackageOverrides to putPackageOverrides." am: 3e686651ad am: 23ea43b0f7 am: d950cd0091 am: 3c94d4f548
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1710628

Change-Id: I226211ad3c877e5f6ace1bcca09819861992448e
2021-05-21 00:03:40 +00:00
Ryan Mitchell
366c9ed48d Merge "Do not call pop_back when app has no uses-sdk" into sc-dev am: 47e58f1238 am: a73daaeb5c am: 8d862438f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14664167

Change-Id: I6b46deeaf9b95a621f95915a11e74609465ebcf4
2021-05-21 00:03:12 +00:00
TreeHugger Robot
967ed6777e Merge "Don't send broadcast to unprepared apps" into sc-dev am: 887a3931ed am: 29cccc0b0e am: c74906a9af
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14531190

Change-Id: I1fafe0ee9d146cbf80f4030ab6eddad4d5348e7e
2021-05-21 00:02:55 +00:00
Lucas Dupin
a88f8edaee Merge "Add setOpaque to TransactionCompat" into sc-dev am: 7a9a236b53 am: d7b044cff8 am: 33baa13637
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14633641

Change-Id: I32499889960abba4e70c4954e53d026c487f0992
2021-05-21 00:02:39 +00:00
TreeHugger Robot
ab22775089 Merge "Add proto tombstones to dropbox directly." into sc-dev am: 131ed89830 am: 2e29a12ebb am: 571224bb11
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14654521

Change-Id: I1e0cfe914e686b401dfa51c250512da9da766bdc
2021-05-21 00:02:20 +00:00
Mady Mellor
7bc0189373 Merge "Fix transitions in the background when launching something in TaskView" into sc-dev am: 83f4345f9e am: a1a2de8882 am: 7ccef9f7e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14551317

Change-Id: Id30bcab152b65352d1734a66346f7699bf288af2
2021-05-21 00:01:51 +00:00
TreeHugger Robot
fce1c751e2 Merge "Don't send broadcast to unprepared apps" into sc-dev am: 887a3931ed am: 7d73c2d9a9 am: 5c25cabc84
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14531190

Change-Id: Id17bf4460513b40a62f6838f9c0b2eb01101828c
2021-05-21 00:01:17 +00:00
Lucas Dupin
ebca562688 Merge "Add setOpaque to TransactionCompat" into sc-dev am: 7a9a236b53 am: e519929e18 am: 0fc9cd3262
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14633641

Change-Id: I50d2adbcce46209bb8097fdddf7e0516f5fbb9b1
2021-05-21 00:00:49 +00:00
Jeff Sharkey
1abe9e5ddc Merge "Relax ACTION_TETHERING_STATE_CHANGED permissions." into sc-dev am: 6e8cafb843
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14666177

Change-Id: Ic5e73a5a6087d14ca6f7c331201e3dbc41ee2d0e
2021-05-21 00:00:34 +00:00
TreeHugger Robot
0edc2d4fb0 Merge "Add proto tombstones to dropbox directly." into sc-dev am: 131ed89830 am: 06b10bfbdc am: c418f8e64c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14654521

Change-Id: I10d218d6ce37a531cd5d2b4850cf1771c55a1414
2021-05-21 00:00:02 +00:00
Jeff Sharkey
6f0a287baf Merge "Relax ACTION_TETHERING_STATE_CHANGED permissions." into sc-dev am: 6e8cafb843
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14666177

Change-Id: I4339775162fa422a893a14f5353914eab396fbf5
2021-05-20 23:58:51 +00:00
Mady Mellor
0aeb37b577 Merge "Fix transitions in the background when launching something in TaskView" into sc-dev am: 83f4345f9e am: 8e0675e789 am: ea4444f387
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14551317

Change-Id: I59f942584b1fcd9cc6c26103f83e9d817d2236a1
2021-05-20 23:58:42 +00:00
Jeff Sharkey
6e8cafb843 Merge "Relax ACTION_TETHERING_STATE_CHANGED permissions." into sc-dev 2021-05-20 23:47:30 +00:00
Ryan Mitchell
01898a5e9d Merge "Do not call pop_back when app has no uses-sdk" into sc-dev am: 47e58f1238 am: d7399e7154
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14664167

Change-Id: Ia03c25aba8f79ddc7258237ef555e3e7d07a13b6
2021-05-20 23:46:14 +00:00
Tom Natan
3c94d4f548 Merge "Rename addPackageOverrides to putPackageOverrides." am: 3e686651ad am: 23ea43b0f7 am: d950cd0091
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1710628

Change-Id: I9fdf7bc8233003be0c8b49e9c0100b493920a561
2021-05-20 23:41:51 +00:00
Ryan Mitchell
8d862438f3 Merge "Do not call pop_back when app has no uses-sdk" into sc-dev am: 47e58f1238 am: a73daaeb5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14664167

Change-Id: Idc02dfbfaff6bb925c46aa25f5cb563bf137bde3
2021-05-20 23:41:29 +00:00
TreeHugger Robot
c74906a9af Merge "Don't send broadcast to unprepared apps" into sc-dev am: 887a3931ed am: 29cccc0b0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14531190

Change-Id: I28cc7880cdb21ecd383b757d7de4aedba8577e0a
2021-05-20 23:41:22 +00:00
Lucas Dupin
33baa13637 Merge "Add setOpaque to TransactionCompat" into sc-dev am: 7a9a236b53 am: d7b044cff8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14633641

Change-Id: I4543119568b73d577a4796834a633bc592b98cd7
2021-05-20 23:41:07 +00:00
TreeHugger Robot
571224bb11 Merge "Add proto tombstones to dropbox directly." into sc-dev am: 131ed89830 am: 2e29a12ebb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14654521

Change-Id: I2136d9fa3bf1d1bda44946e2c3ab492196190fe8
2021-05-20 23:40:28 +00:00
Mady Mellor
7ccef9f7e9 Merge "Fix transitions in the background when launching something in TaskView" into sc-dev am: 83f4345f9e am: a1a2de8882
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14551317

Change-Id: I3f50130239fcef21e9c6b6b0f77cc72017610e7b
2021-05-20 23:39:24 +00:00
Ryan Mitchell
d7399e7154 Merge "Do not call pop_back when app has no uses-sdk" into sc-dev am: 47e58f1238
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14664167

Change-Id: Ieb9a00879570f1d945d6894aab16c7c624e7a34e
2021-05-20 23:39:14 +00:00
TreeHugger Robot
5c25cabc84 Merge "Don't send broadcast to unprepared apps" into sc-dev am: 887a3931ed am: 7d73c2d9a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14531190

Change-Id: Ib80101246884d13543d6d33a4cd5cf4b6cfcd4be
2021-05-20 23:38:46 +00:00
Tom Natan
d950cd0091 Merge "Rename addPackageOverrides to putPackageOverrides." am: 3e686651ad am: 23ea43b0f7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1710628

Change-Id: I53681e172d49ebadc93678a091d75fbf9e4db3dd
2021-05-20 23:38:39 +00:00
Lucas Dupin
0fc9cd3262 Merge "Add setOpaque to TransactionCompat" into sc-dev am: 7a9a236b53 am: e519929e18
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14633641

Change-Id: I49a8ec7eeeeac5d791adea779ff9d53e35a7670f
2021-05-20 23:38:18 +00:00
TreeHugger Robot
c418f8e64c Merge "Add proto tombstones to dropbox directly." into sc-dev am: 131ed89830 am: 06b10bfbdc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14654521

Change-Id: I7ec575c6eff283bb73de0b9cce310aba7811b73a
2021-05-20 23:38:03 +00:00
Ryan Mitchell
a73daaeb5c Merge "Do not call pop_back when app has no uses-sdk" into sc-dev am: 47e58f1238
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14664167

Change-Id: I05aad42f7077ee8f285e8df581608e872731834c
2021-05-20 23:37:22 +00:00
Mady Mellor
ea4444f387 Merge "Fix transitions in the background when launching something in TaskView" into sc-dev am: 83f4345f9e am: 8e0675e789
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14551317

Change-Id: I5ac22a88da2fd8992732fa15f0201bb4bb50f20c
2021-05-20 23:37:19 +00:00
Ryan Mitchell
47e58f1238 Merge "Do not call pop_back when app has no uses-sdk" into sc-dev 2021-05-20 23:21:43 +00:00
TreeHugger Robot
7d73c2d9a9 Merge "Don't send broadcast to unprepared apps" into sc-dev am: 887a3931ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14531190

Change-Id: I14ee150a0ce011b77cd9998771405a1a21cb5cc1
2021-05-20 23:17:07 +00:00
Lucas Dupin
e519929e18 Merge "Add setOpaque to TransactionCompat" into sc-dev am: 7a9a236b53
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14633641

Change-Id: I86ca6dc3e9058aba42dd4f9475f690456f7c3194
2021-05-20 23:16:43 +00:00
TreeHugger Robot
06b10bfbdc Merge "Add proto tombstones to dropbox directly." into sc-dev am: 131ed89830
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14654521

Change-Id: I4eb151f4b309cbb229c43ad2edcca089afd1ba7e
2021-05-20 23:16:15 +00:00
Mady Mellor
8e0675e789 Merge "Fix transitions in the background when launching something in TaskView" into sc-dev am: 83f4345f9e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14551317

Change-Id: I973eed431d2fa4fd7aee3e81af0473ad2dd3f98d
2021-05-20 23:15:47 +00:00
TreeHugger Robot
29cccc0b0e Merge "Don't send broadcast to unprepared apps" into sc-dev am: 887a3931ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14531190

Change-Id: I5cded8fa98bddc71922e93788870f2e7019d208a
2021-05-20 23:15:27 +00:00