Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
542,466 Commits 3 Branches 0 Tags
56936beddd997d381a4e893c437d396caabbe02e
Commit Graph

542466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shinru Han
43c5f54f28 「DO NOT MERGE」Revert "Get ApnIpType from ConnectivityManager#getLinkProperties()" am: d461be709f am: 7d4b7f3466 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11899380

Change-Id: Ia47585f40a9fd13e2bf80f28e7d344fe63ee2c07
 2020-06-19 15:53:33 +00:00
Automerger Merge Worker
c0e6d6d772 Merge changes from topic "am-f59e5e992a2d448d8991d0ff384a3aa2" into rvc-d1-dev-plus-aosp 
* changes:
  Merge "「DO NOT MERGE」Revert "Get ApnIpType from ConnectivityManager#getLinkProperties()"" into rvc-dev am: eca0b3f9fb am: 691e4c6427
  「DO NOT MERGE」Revert "Get ApnIpType from ConnectivityManager#getLinkProperties()" am: d461be709f am: a4fbb2a737
 2020-06-19 15:53:28 +00:00
TreeHugger Robot
0b5cbc733d Merge "「DO NOT MERGE」Revert "Get ApnIpType from ConnectivityManager#getLinkProperties()"" into rvc-dev am: eca0b3f9fb am: 691e4c6427 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11899380

Change-Id: I8f10306b4c26e276446a1e54cef34743df963937
 2020-06-19 15:53:23 +00:00
Shinru Han
b403faeb75 「DO NOT MERGE」Revert "Get ApnIpType from ConnectivityManager#getLinkProperties()" am: d461be709f am: a4fbb2a737 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11899380

Change-Id: I02fb10a7af99a22f99ebd597877371902bd4b939
 2020-06-19 15:53:20 +00:00
TreeHugger Robot
512e8d9828 Merge "「DO NOT MERGE」Revert "Get ApnIpType from ConnectivityManager#getLinkProperties()"" into rvc-dev am: eca0b3f9fb am: 0c1708bfe9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11899380

Change-Id: I04012ecb7f41e28174c2ce341eacd6ba472be179
 2020-06-19 15:53:13 +00:00
Shinru Han
5c2b5da743 「DO NOT MERGE」Revert "Get ApnIpType from ConnectivityManager#getLinkProperties()" am: d461be709f am: 7d4b7f3466 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11899380

Change-Id: I6953d88c8d822887c3812e8f3342509c09684739
 2020-06-19 15:53:09 +00:00
Yara Hassan
51715229f9 Merge "Catch RemoteExceptions in DataShareCallbackDelegate" into rvc-dev 2020-06-19 15:49:17 +00:00
TreeHugger Robot
ade182cdb6 Merge "Fix off-center bubble pointer" into rvc-dev 2020-06-19 15:46:29 +00:00
TreeHugger Robot
691e4c6427 Merge "「DO NOT MERGE」Revert "Get ApnIpType from ConnectivityManager#getLinkProperties()"" into rvc-dev am: eca0b3f9fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11899380

Change-Id: I4cbe764cd855665db28e96bfb57c7af200513b17
 2020-06-19 15:41:57 +00:00
Automerger Merge Worker
092467da01 Merge "Merge "Show disclosure for organization-owned work profile" into rvc-dev am: db36471478 am: 562470c2ab am: 1e62a384b6" into rvc-qpr-dev-plus-aosp 2020-06-19 15:41:56 +00:00
TreeHugger Robot
0c1708bfe9 Merge "「DO NOT MERGE」Revert "Get ApnIpType from ConnectivityManager#getLinkProperties()"" into rvc-dev am: eca0b3f9fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11899380

Change-Id: Ib5126325e907f0f6c99d0281562ebcb195808e19
 2020-06-19 15:41:55 +00:00
Shinru Han
a4fbb2a737 「DO NOT MERGE」Revert "Get ApnIpType from ConnectivityManager#getLinkProperties()" am: d461be709f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11899380

Change-Id: I9a1cbead0897a297fcaf825dfe89d97f85bbb3d1
 2020-06-19 15:41:53 +00:00
Shinru Han
7d4b7f3466 「DO NOT MERGE」Revert "Get ApnIpType from ConnectivityManager#getLinkProperties()" am: d461be709f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11899380

Change-Id: Id1296d30a54331bde0e199a30b6dadd766e4f96a
 2020-06-19 15:41:52 +00:00
Antoan Angelov
49c4d9dcf6 Merge "Show disclosure for organization-owned work profile" into rvc-dev am: db36471478 am: 2dd34d342e am: a4f6742ce3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818612

Change-Id: I67aaf00c30e668256685db82ff22e1a6170e3cc9
 2020-06-19 15:41:50 +00:00
Antoan Angelov
ab7e65e7b7 Merge "Show disclosure for organization-owned work profile" into rvc-dev am: db36471478 am: 562470c2ab am: 1e62a384b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818612

Change-Id: I01bd095e0489ecb2c9c764f78b4719c51de4bac1
 2020-06-19 15:41:41 +00:00
Antoan Angelov
882a0cd5ea Merge "Show disclosure for organization-owned work profile" into rvc-dev am: db36471478 am: 562470c2ab am: 12b7470a13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818612

Change-Id: Idd12439f3e45d86266311c94c6e739e755912770
 2020-06-19 15:41:28 +00:00
Antoan Angelov
1e62a384b6 Merge "Show disclosure for organization-owned work profile" into rvc-dev am: db36471478 am: 562470c2ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818612

Change-Id: I186df2621a0d76fa526394da9d99d682ec9b88dd
 2020-06-19 15:23:40 +00:00
Antoan Angelov
a4f6742ce3 Merge "Show disclosure for organization-owned work profile" into rvc-dev am: db36471478 am: 2dd34d342e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818612

Change-Id: I685c5a7bb096ffad59367ac496e27bd3e64e5d0e
 2020-06-19 15:23:39 +00:00
Antoan Angelov
12b7470a13 Merge "Show disclosure for organization-owned work profile" into rvc-dev am: db36471478 am: 562470c2ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818612

Change-Id: I2737fe5de904c3b2f758414074638f415b5656db
 2020-06-19 15:23:20 +00:00
TreeHugger Robot
eca0b3f9fb Merge "「DO NOT MERGE」Revert "Get ApnIpType from ConnectivityManager#getLinkProperties()"" into rvc-dev 2020-06-19 15:21:36 +00:00
Fabian Kozynski
f3fb89347a Change BroadcastDispatcher to 1receiver/action 
With the aggregated filter, as it had to be registered when any single
action changed (added for first time or removed the last receiver for
that action), if there was any action that got periodically
registered/unregistered, it would cause frequent cycles of
unregister/register with Context. This leads to interruption of service.

With this change, changes in one action would not affect receivers for
the others.

Test: manual, SystemUI works as expected
Test: manual, dumps and logs
Test: atest UserBroadcastDispatcherTest ActionReceiverTest
Bug: 148390204
Bug: 157165818

Change-Id: I7961f6c60600dfa0407615319c43bb72e43b4795
 2020-06-19 11:21:02 -04:00
Automerger Merge Worker
0cadfd29a4 [automerger skipped] Merge "Merge "Pass updatable driver path to native GPU service." into rvc-dev am: c57d55b7b0 am: 179de3ff09" into rvc-d1-dev-plus-aosp am: 6a5b6c861c -s ours 
am skip reason: Change-Id Ibba84cb0184d9f1601355c1cac7d439949a2eec6 with SHA-1 b4f8478f81 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11902768

Change-Id: I669b31e8ae808c7d871e74ba133bf5689acb4d76
 2020-06-19 15:13:36 +00:00
Automerger Merge Worker
aeb2d29f3e Merge "Merge "Pass updatable driver path to native GPU service." into rvc-dev am: c57d55b7b0 am: 179de3ff09 am: e0e4ace505" into rvc-qpr-dev-plus-aosp 2020-06-19 15:13:17 +00:00
TreeHugger Robot
98af05e9fb Merge "Pass updatable driver path to native GPU service." into rvc-dev am: c57d55b7b0 am: af03f3ddf1 am: a8e2d6bcbf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11902768

Change-Id: I502c1df7e1553ea480f615b1d70b77922d61eb1d
 2020-06-19 15:13:04 +00:00
TreeHugger Robot
100bb9ca66 Merge "Pass updatable driver path to native GPU service." into rvc-dev am: c57d55b7b0 am: 179de3ff09 am: e0e4ace505 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11902768

Change-Id: If8264f06c94dacf9b8b26d5f1ba5ed380fdc9aa9
 2020-06-19 15:13:03 +00:00
Antoan Angelov
2dd34d342e Merge "Show disclosure for organization-owned work profile" into rvc-dev am: db36471478 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818612

Change-Id: I03b8694efe021d28cd79bcb2ba75a8e630a7a98f
 2020-06-19 15:06:03 +00:00
Antoan Angelov
562470c2ab Merge "Show disclosure for organization-owned work profile" into rvc-dev am: db36471478 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818612

Change-Id: I5a8706e3dd8381062c1bc6b04e6f64b476f873e1
 2020-06-19 15:05:23 +00:00
Automerger Merge Worker
6a5b6c861c Merge "Merge "Pass updatable driver path to native GPU service." into rvc-dev am: c57d55b7b0 am: 179de3ff09" into rvc-d1-dev-plus-aosp 2020-06-19 14:57:22 +00:00
TreeHugger Robot
a8e2d6bcbf Merge "Pass updatable driver path to native GPU service." into rvc-dev am: c57d55b7b0 am: af03f3ddf1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11902768

Change-Id: I5ea2b06bb6d6f4e62d767f8a8b2842c3d6308522
 2020-06-19 14:57:14 +00:00
TreeHugger Robot
020f8eabae Merge "Pass updatable driver path to native GPU service." into rvc-dev am: c57d55b7b0 am: 179de3ff09 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11902768

Change-Id: I5ac7d776a41db5ec0b3fa59a86e55eb0fcb173af
 2020-06-19 14:57:07 +00:00
TreeHugger Robot
e0e4ace505 Merge "Pass updatable driver path to native GPU service." into rvc-dev am: c57d55b7b0 am: 179de3ff09 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11902768

Change-Id: I4dad042e235c07db239e22514ded0fd32781c5d3
 2020-06-19 14:57:06 +00:00
Antoan Angelov
db36471478 Merge "Show disclosure for organization-owned work profile" into rvc-dev 2020-06-19 14:52:02 +00:00
Jorim Jaggi
1487102763 Merge changes Ia7d9514e,I3e9e4f47 into rvc-dev am: 5cc486b1a1 am: d6b31c540b am: 4485ee88a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11920861

Change-Id: Ie71e237e9336ea4eb153c960c12ab644e8dd1a87
 2020-06-19 14:46:46 +00:00
Automerger Merge Worker
a758ba9cea Merge "Merge changes Ia7d9514e,I3e9e4f47 into rvc-dev am: 5cc486b1a1 am: f3dfb52c65" into rvc-d1-dev-plus-aosp am: 9c8afa114b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11920861

Change-Id: I377de051953bd6cd1fc5497fa514c5be44df0124
 2020-06-19 14:46:37 +00:00
Jorim Jaggi
203ee45a71 Merge changes Ia7d9514e,I3e9e4f47 into rvc-dev am: 5cc486b1a1 am: f3dfb52c65 am: f6c42e5a96 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11920861

Change-Id: I616a490a859162aca5d3b095d920dc72b0e77a6c
 2020-06-19 14:46:24 +00:00
Automerger Merge Worker
0ff0edce75 Merge "Merge "Revert "Only promote remote animator to top sched group during animation"" into rvc-dev am: e8e3bf523a am: b1520db129 am: d33f8e8ed6" into rvc-qpr-dev-plus-aosp 2020-06-19 14:46:19 +00:00
Automerger Merge Worker
1d9e9d0f57 Merge "Merge "Revert "Only promote remote animator to top sched group during animation"" into rvc-dev am: e8e3bf523a am: de83ae1424" into rvc-d1-dev-plus-aosp am: c8ce4d0b85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11891200

Change-Id: I4ebe45075c831e32954801280efd9374f6bd23f1
 2020-06-19 14:45:58 +00:00
TreeHugger Robot
09f10b1be2 Merge "Revert "Only promote remote animator to top sched group during animation"" into rvc-dev am: e8e3bf523a am: b1520db129 am: d33f8e8ed6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11891200

Change-Id: I7e7991b99bb2c4c94d93592831c3110b619b2329
 2020-06-19 14:45:52 +00:00
TreeHugger Robot
958ac29691 Merge "Revert "Only promote remote animator to top sched group during animation"" into rvc-dev am: e8e3bf523a am: b1520db129 am: ef1683c2fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11891200

Change-Id: I185264035608551f90f1e05c88b33a31b7aae1e5
 2020-06-19 14:45:46 +00:00
TreeHugger Robot
af03f3ddf1 Merge "Pass updatable driver path to native GPU service." into rvc-dev am: c57d55b7b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11902768

Change-Id: Ib22046b2b8b16560894844647b39bfcd75cb774e
 2020-06-19 14:40:15 +00:00
TreeHugger Robot
179de3ff09 Merge "Pass updatable driver path to native GPU service." into rvc-dev am: c57d55b7b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11902768

Change-Id: If82fec70f5d66e7d54a0e82903b5d63eefc9960e
 2020-06-19 14:40:01 +00:00
Jorim Jaggi
4485ee88a7 Merge changes Ia7d9514e,I3e9e4f47 into rvc-dev am: 5cc486b1a1 am: d6b31c540b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11920861

Change-Id: I57a5240ce7fd733d6939b881459dc5f89074fe0a
 2020-06-19 14:32:55 +00:00
Jorim Jaggi
f6c42e5a96 Merge changes Ia7d9514e,I3e9e4f47 into rvc-dev am: 5cc486b1a1 am: f3dfb52c65 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11920861

Change-Id: Ie003ce06ed95c3c243335bad518c09cee257a103
 2020-06-19 14:32:46 +00:00
Automerger Merge Worker
9c8afa114b Merge "Merge changes Ia7d9514e,I3e9e4f47 into rvc-dev am: 5cc486b1a1 am: f3dfb52c65" into rvc-d1-dev-plus-aosp 2020-06-19 14:32:37 +00:00
TreeHugger Robot
d33f8e8ed6 Merge "Revert "Only promote remote animator to top sched group during animation"" into rvc-dev am: e8e3bf523a am: b1520db129 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11891200

Change-Id: I43160ff00e1e9a03bc439c04d341cc8836fd0a6b
 2020-06-19 14:32:36 +00:00
Jorim Jaggi
cd350453d6 Merge changes Ia7d9514e,I3e9e4f47 into rvc-dev am: 5cc486b1a1 am: f3dfb52c65 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11920861

Change-Id: I0fa24dba86e7aad7dd4cc2315c7556dee88b44a3
 2020-06-19 14:32:31 +00:00
Automerger Merge Worker
c8ce4d0b85 Merge "Merge "Revert "Only promote remote animator to top sched group during animation"" into rvc-dev am: e8e3bf523a am: de83ae1424" into rvc-d1-dev-plus-aosp 2020-06-19 14:32:30 +00:00
TreeHugger Robot
180fae12f2 Merge "Revert "Only promote remote animator to top sched group during animation"" into rvc-dev am: e8e3bf523a am: de83ae1424 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11891200

Change-Id: I16c098cd1878e6e8f31d251f3db56cd12c35169b
 2020-06-19 14:32:26 +00:00
TreeHugger Robot
ef1683c2fc Merge "Revert "Only promote remote animator to top sched group during animation"" into rvc-dev am: e8e3bf523a am: b1520db129 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11891200

Change-Id: I72c4da90f5c185ac059aa7cc2d045de5b1517908
 2020-06-19 14:32:09 +00:00
Galia Peycheva
ce6270f532 Make config_assistantOnTopOfDream a TestApi 
Test: atest AssistantStackTests
Bug: 158117282
Change-Id: I154e8b7d3fbf842fa9f1bef82a59193550af5620
 2020-06-19 16:25:58 +02:00