Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
557,464 Commits 3 Branches 0 Tags
9893f1663d5da3f92e82618f93348828632665b8
Commit Graph

557464 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad Ebinger
9893f1663d Merge changes from topic "redo_ims_poll" am: ec6681c927 am: 58e629fd68 am: 82a16c7900 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1449280

Change-Id: I10e60023c1539abd8ac25ea8ed66ef53e06eee41
 2020-10-07 19:59:03 +00:00
Brad Ebinger
182dd1f8aa Clean up IMS based interfaces to use a push model instead of poll am: 1e9cc7b2e5 am: 4c8316091f am: 790aaee786 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1449279

Change-Id: Ifad722576fa6a2754ea3bb20a34b343faff2213f
 2020-10-07 19:58:53 +00:00
Brad Ebinger
82a16c7900 Merge changes from topic "redo_ims_poll" am: ec6681c927 am: 58e629fd68 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1449280

Change-Id: I74f5803c1bc875aa5b22de4e24e0b140d258cd70
 2020-10-07 19:16:28 +00:00
Brad Ebinger
790aaee786 Clean up IMS based interfaces to use a push model instead of poll am: 1e9cc7b2e5 am: 4c8316091f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1449279

Change-Id: I9d3770f5e62038d4c32167e322c74b67dd82876a
 2020-10-07 19:16:20 +00:00
Brad Ebinger
58e629fd68 Merge changes from topic "redo_ims_poll" am: ec6681c927 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1449280

Change-Id: I0972e8db35cc51932578fa8e9e785466352d203a
 2020-10-07 18:49:39 +00:00
Brad Ebinger
4c8316091f Clean up IMS based interfaces to use a push model instead of poll am: 1e9cc7b2e5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1449279

Change-Id: Ia942c0ba88d6ba081569540b617d9b79fb758659
 2020-10-07 18:41:47 +00:00
Brad Ebinger
ec6681c927 Merge changes from topic "redo_ims_poll" 
* changes:
  Remove "one shot" type of FeatureCallback
  Clean up IMS based interfaces to use a push model instead of poll
 2020-10-07 17:49:29 +00:00
TreeHugger Robot
e1b0c1910e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 2943d70788 -s ours am: 9e0859b765 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I77b414fb29ac2e1d6937d9ac147ce8e977c34ae5
 2020-10-07 17:17:43 +00:00
TreeHugger Robot
5ce35c2908 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b3cbc66070 -s ours am: 9339405d43 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3c1f2a86811496af314bb368a3776688aea22d97
 2020-10-07 17:17:20 +00:00
TreeHugger Robot
9e0859b765 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 2943d70788 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I498fde935ed482f1ca23a5d59106db74c1e5f7fc
 2020-10-07 16:55:31 +00:00
TreeHugger Robot
9339405d43 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b3cbc66070 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I03a30296c345b03579ddc823e77329e3439c12f4
 2020-10-07 16:55:01 +00:00
TreeHugger Robot
2943d70788 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-10-07 15:57:40 +00:00
TreeHugger Robot
b3cbc66070 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-10-07 15:54:38 +00:00
TreeHugger Robot
38b00969e8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: cfe0491c27 -s ours am: 70517ab022 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ida6baaef29e2fda1b2c8076abb3ab841ca8fe18d
 2020-10-07 15:08:21 +00:00
TreeHugger Robot
836eee53ef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: aabad94a4d -s ours am: 5d29c1510b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I950819a6831e7c5f5722dd1c942376c94468d772
 2020-10-07 15:08:09 +00:00
TreeHugger Robot
42fbf5a0da [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 0609e2b01d -s ours am: 5e3cda6760 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I15cd6d7b494a60bb6c85c93d57947bb2a74a3ffb
 2020-10-07 15:07:46 +00:00
TreeHugger Robot
70517ab022 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: cfe0491c27 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6d43d953eccaa78a34bf74c384874d227a1e818e
 2020-10-07 14:46:34 +00:00
TreeHugger Robot
cfe0491c27 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-10-07 14:41:19 +00:00
TreeHugger Robot
5d29c1510b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: aabad94a4d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6e56f3f71c87e38ab5a0f2158085193cc7c31812
 2020-10-07 14:36:05 +00:00
TreeHugger Robot
5e3cda6760 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 0609e2b01d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie9c9198b08f164bc16189738c571ab359bc048f1
 2020-10-07 14:35:18 +00:00
TreeHugger Robot
aabad94a4d Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-10-07 14:26:24 +00:00
TreeHugger Robot
0609e2b01d Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-10-07 14:20:52 +00:00
Bill Yi
5581023158 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0e349a495a3642ec1d3830bff526ed25001f9f75
 2020-10-07 04:54:22 -07:00
Anton Hansson
c6cb7e9b1d Merge "Add genrule for combined-removed-dex" am: b0ba7618c8 am: dd7eb2b019 am: a07b8d4e93 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1446678

Change-Id: I0840de9ac273a0d4f8ea006dd7a1ae9b8ffe5ae1
 2020-10-07 10:56:42 +00:00
Mark Chien
78c744d29e Merge "Make the IP subnet persistent till reboot" am: 818da784dd am: fabe5787f0 am: 17c2040532 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432958

Change-Id: I6d76e970384a3021e1fe519a268627628f45d446
 2020-10-07 10:56:13 +00:00
Anton Hansson
a07b8d4e93 Merge "Add genrule for combined-removed-dex" am: b0ba7618c8 am: dd7eb2b019 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1446678

Change-Id: I93de42fc706d521307b7cf08ac328b182131a542
 2020-10-07 10:18:32 +00:00
Mark Chien
17c2040532 Merge "Make the IP subnet persistent till reboot" am: 818da784dd am: fabe5787f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432958

Change-Id: Ib0d9e5b21b88fd352b06b3064ef3c34de4c046ce
 2020-10-07 10:18:00 +00:00
David Su
1d9709071d [automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628bd am: 60cf3eebd5 -s ours am: 615d6b6ba6 -s ours am: aeac5e7d30 -s ours am: 5c2b86fbed -s ours am: 4c94806e28 -s ours am: 008d947b59 -s ours am: 81e1bdcb6f -s ours am: 8bb65f94c8 -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 e57c25a451 is in history

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

Change-Id: I5962cb5d568d6aa02b7b2d4489e3c348fa425c37
 2020-10-07 10:09:51 +00:00
Chiachang Wang
ff3649cd5d Merge "Update to positive logic to better match the method naming" am: 1c7bc039ea am: a7136c6340 am: 50d0fa47ee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450336

Change-Id: I2e1203c0864e04c1e0229ef4a8727a0719a3d139
 2020-10-07 10:02:54 +00:00
Chiachang Wang
220980578f Merge "Prevent going through unnecessary networks" am: 836af202e0 am: 7039b0ca8a am: c65f31e0db 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1436691

Change-Id: Ide84627fb0e0f04edb7b9078fe3c6dc42bcd5202
 2020-10-07 10:02:13 +00:00
David Su
d02585b988 [automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628bd am: 60cf3eebd5 -s ours am: 615d6b6ba6 -s ours am: aeac5e7d30 -s ours am: 5c2b86fbed -s ours am: 4c94806e28 -s ours am: 008d947b59 -s ours am: 81e1bdcb6f -s ours am: 5ddf8dd40a -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad2a is in history

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

Change-Id: Id8576015fa0c90b4c82e36d9e667733ad08590f9
 2020-10-07 10:01:57 +00:00
Anton Hansson
dd7eb2b019 Merge "Add genrule for combined-removed-dex" am: b0ba7618c8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1446678

Change-Id: If74e60e3b97c22bdeb32e59b56c9476e6adf64fb
 2020-10-07 10:00:18 +00:00
Mark Chien
fabe5787f0 Merge "Make the IP subnet persistent till reboot" am: 818da784dd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432958

Change-Id: I0aaa978e8edd7e8666413fb18352fa83e9fb5469
 2020-10-07 09:55:29 +00:00
Anton Hansson
b0ba7618c8 Merge "Add genrule for combined-removed-dex" 2020-10-07 09:54:43 +00:00
Chiachang Wang
50d0fa47ee Merge "Update to positive logic to better match the method naming" am: 1c7bc039ea am: a7136c6340 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450336

Change-Id: I6e823ac8769864d9a1bfd6d675331d4b683da331
 2020-10-07 09:50:45 +00:00
Chiachang Wang
c65f31e0db Merge "Prevent going through unnecessary networks" am: 836af202e0 am: 7039b0ca8a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1436691

Change-Id: Ic09b161eeff7203c9516b3fc803df6b8deacd010
 2020-10-07 09:48:32 +00:00
David Su
8bb65f94c8 [automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628bd am: 60cf3eebd5 -s ours am: 615d6b6ba6 -s ours am: aeac5e7d30 -s ours am: 5c2b86fbed -s ours am: 4c94806e28 -s ours am: 008d947b59 -s ours am: 81e1bdcb6f -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad2a is in history

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

Change-Id: I8ab0879a362d5b9b9aa24599de46794eda706fdc
 2020-10-07 09:47:42 +00:00
David Su
5ddf8dd40a [automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628bd am: 60cf3eebd5 -s ours am: 615d6b6ba6 -s ours am: aeac5e7d30 -s ours am: 5c2b86fbed -s ours am: 4c94806e28 -s ours am: 008d947b59 -s ours am: 81e1bdcb6f -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad2a is in history

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

Change-Id: I31474e5b0a894300ea0dc5fa18c87bdf2f8d1f18
 2020-10-07 09:47:10 +00:00
Mark Chien
818da784dd Merge "Make the IP subnet persistent till reboot" 2020-10-07 09:39:29 +00:00
Bill Yi
45889f6edb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I14c04e0e9b99c8227a12a9e49cf0c8e28f92c0f7
 2020-10-07 02:38:30 -07:00
David Su
81e1bdcb6f [automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628bd am: 60cf3eebd5 -s ours am: 615d6b6ba6 -s ours am: aeac5e7d30 -s ours am: 5c2b86fbed -s ours am: 4c94806e28 -s ours am: 008d947b59 -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad2a is in history

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

Change-Id: I85509e7b2ad905c15e7280bf2d6b57c02ea068fb
 2020-10-07 09:34:40 +00:00
Chiachang Wang
a7136c6340 Merge "Update to positive logic to better match the method naming" am: 1c7bc039ea 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450336

Change-Id: Ib01ae19fb846fdd75cf792e85dc1776a4a6876ee
 2020-10-07 09:22:49 +00:00
Chiachang Wang
7039b0ca8a Merge "Prevent going through unnecessary networks" am: 836af202e0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1436691

Change-Id: I7e7603f416202a387804a7060e6b1d62ce81c6bd
 2020-10-07 09:19:35 +00:00
David Su
008d947b59 [automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628bd am: 60cf3eebd5 -s ours am: 615d6b6ba6 -s ours am: aeac5e7d30 -s ours am: 5c2b86fbed -s ours am: 4c94806e28 -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad2a is in history

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

Change-Id: If5edb76ce859af8506a381856c6b3b0058aee541
 2020-10-07 09:18:41 +00:00
David Su
4c94806e28 [automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628bd am: 60cf3eebd5 -s ours am: 615d6b6ba6 -s ours am: aeac5e7d30 -s ours am: 5c2b86fbed -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad2a is in history

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

Change-Id: Id637abc5705e488e2bc77122e052b9d3ea475ae3
 2020-10-07 08:32:52 +00:00
Hai Zhang
998b69eedd Merge "Add myself to system server permission code OWNERS." am: 1839f9f7f8 am: be5c84157b am: 74a162c7b9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450996

Change-Id: I05f45b6dd697ec4022c7973cad0926cc8e46c0b2
 2020-10-07 08:24:38 +00:00
Chiachang Wang
1c7bc039ea Merge "Update to positive logic to better match the method naming" 2020-10-07 08:21:32 +00:00
Chiachang Wang
836af202e0 Merge "Prevent going through unnecessary networks" 2020-10-07 08:21:04 +00:00
David Su
5c2b86fbed [automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628bd am: 60cf3eebd5 -s ours am: 615d6b6ba6 -s ours am: aeac5e7d30 -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad2a is in history

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

Change-Id: Ic97189261040a3eef447064ceed038727fb11120
 2020-10-07 08:16:39 +00:00
Hai Zhang
74a162c7b9 Merge "Add myself to system server permission code OWNERS." am: 1839f9f7f8 am: be5c84157b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450996

Change-Id: I9f32642be1caa0271f1838a74f65b9c00462ba4f
 2020-10-07 08:09:51 +00:00