Commit Graph

585679 Commits

Author SHA1 Message Date
Brad Ebinger
91f87bfbea Revert "Clean up IMS based interfaces to use a push model instea..."
Revert "Move IMS to a listener type model instead of a poll model"

Revert "Push Binder updates when ImsFeatures change"

Revert submission 1425374-ims_poll

Reason for revert: b/169729036, ANR in phone process
Reverted Changes:
I1d6dd2dfd:Move to a push model of querying ImsFeature Binder...
Ie3982c245:Move IMS to a listener type model instead of a pol...
I8b9ded0f4:Push Binder updates when ImsFeatures change
Ia9f7ae3db:Clean up IMS based interfaces to use a push model ...

Change-Id: I7ef3c07021a79e809d2c8b30ed2422372eae962d
2020-09-30 10:29:30 -07:00
Neil Fuller
a52607516b Merge "Refactoring to make adding a secondary easier" 2020-09-30 16:04:23 +00:00
Anton Hansson
77ab884db2 Merge "Revert "Add genrules for merged removed.txt files"" am: 27b40fc234 am: de51075d79 am: 1691d6d02a am: 4c42b5ee98 am: e453ae2d45
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1442896

Change-Id: Ie33e6632618ca6a7af0efa95b36c3a2cc13a8bf3
2020-09-30 16:01:53 +00:00
TreeHugger Robot
11b9382218 Merge "Revert "Set ENABLE_DYNAMIC_PERMISSIONS = false until ag/12511042 is ready."" 2020-09-30 15:35:32 +00:00
Jay Aliomer
df376b076e Merge "Remove TargetName from the pebble shape overlay" 2020-09-30 15:26:18 +00:00
Anton Hansson
e453ae2d45 Merge "Revert "Add genrules for merged removed.txt files"" am: 27b40fc234 am: de51075d79 am: 1691d6d02a am: 4c42b5ee98
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1442896

Change-Id: I28a8008b6228d95f906499acab64c20f80120459
2020-09-30 15:19:34 +00:00
Anton Hansson
4c42b5ee98 Merge "Revert "Add genrules for merged removed.txt files"" am: 27b40fc234 am: de51075d79 am: 1691d6d02a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1442896

Change-Id: I6109a937e1efa42094309e54a24e9851dacb92f6
2020-09-30 14:51:04 +00:00
Neil Fuller
e23fca65cd Merge "Get ready to add System APIs for use by SUW" 2020-09-30 14:46:11 +00:00
Anton Hansson
1691d6d02a Merge "Revert "Add genrules for merged removed.txt files"" am: 27b40fc234 am: de51075d79
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1442896

Change-Id: I24152a58ea0ae22fe29b04fb9cbb3351b65b7aaf
2020-09-30 14:39:30 +00:00
Riddle Hsu
b3e2b63d91 Merge "Use normal rotation if orientation is changed by resume-scheduled app" 2020-09-30 14:35:09 +00:00
Lorenzo Colitti
96aeb654c8 Merge changes I53ca4b98,I1757fdeb am: 3a463815e2 am: 230fabb17e am: 1569c71b07 am: 3616f6eced am: 3cae8eec79
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440767

Change-Id: I6960604ea5fe5958906d9f62d0c5816d222a5b25
2020-09-30 14:33:32 +00:00
Andrei-Valentin Onea
ecd1f8aa9b Merge "Fix compat change CTS test flakiness" am: bb0db1d243 am: 3d1cfa54d6 am: 1fe983edb7 am: 3a5b1a12c5 am: bc74c915c8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440635

Change-Id: Ib5ce1e3bf4e69f85c2044093e3ad7a56f2ace240
2020-09-30 14:33:07 +00:00
Lorenzo Colitti
3cae8eec79 Merge changes I53ca4b98,I1757fdeb am: 3a463815e2 am: 230fabb17e am: 1569c71b07 am: 3616f6eced
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440767

Change-Id: Ie09b0bf8b8e4fa76c78187ed9915735944b05521
2020-09-30 14:32:48 +00:00
Anton Hansson
de51075d79 Merge "Revert "Add genrules for merged removed.txt files"" am: 27b40fc234
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1442896

Change-Id: I8e57f13db22b46bf1394dd43b905bb0bf8510d18
2020-09-30 14:19:18 +00:00
Lorenzo Colitti
3616f6eced Merge changes I53ca4b98,I1757fdeb am: 3a463815e2 am: 230fabb17e am: 1569c71b07
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440767

Change-Id: Ia2779a68a17225190222b56358d6ca13a97ea00a
2020-09-30 14:18:54 +00:00
Roshan Pius
d025d3b472 Merge changes from topics "oem_paid_suggestions", "sta_sta_feature"
* changes:
  WifiNetworkSuggestion: Add setOemPaid flag
  WifiManager: Add public API for STA + STA concurrency support
2020-09-30 14:17:37 +00:00
Andrei-Valentin Onea
bc74c915c8 Merge "Fix compat change CTS test flakiness" am: bb0db1d243 am: 3d1cfa54d6 am: 1fe983edb7 am: 3a5b1a12c5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440635

Change-Id: I60cfbb9a875fb2e7f0759b84732f9172ed97cdf0
2020-09-30 14:02:29 +00:00
TreeHugger Robot
9920baf440 Merge "Add a command line interface to SystemUI" 2020-09-30 13:56:55 +00:00
Lorenzo Colitti
1569c71b07 Merge changes I53ca4b98,I1757fdeb am: 3a463815e2 am: 230fabb17e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440767

Change-Id: I59f834071b66d310652016a626b0f8a6bb471d03
2020-09-30 13:53:31 +00:00
Anton Hansson
27b40fc234 Merge "Revert "Add genrules for merged removed.txt files"" 2020-09-30 13:51:21 +00:00
Anton Hansson
ca5b8b5c6f Revert "Add genrules for merged removed.txt files"
This reverts commit cfb26e3b4c.

Reason for revert: b/169747069

Change-Id: I9290708aea6a66bbecc098b75403f6e5d7e77ec7
2020-09-30 13:50:48 +00:00
Andrei-Valentin Onea
3a5b1a12c5 Merge "Fix compat change CTS test flakiness" am: bb0db1d243 am: 3d1cfa54d6 am: 1fe983edb7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440635

Change-Id: Id36d3ce48a39d40f714ef5131b4cee4644d1a590
2020-09-30 13:45:05 +00:00
Lorenzo Colitti
230fabb17e Merge changes I53ca4b98,I1757fdeb am: 3a463815e2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440767

Change-Id: If1d0eb5a1818dd7a9346f8d0d64d5f37ea1b53c2
2020-09-30 13:14:23 +00:00
Fabian Kozynski
98a5330985 Merge "Migrate to new UserTracker for currentUser" 2020-09-30 13:09:24 +00:00
Andrei-Valentin Onea
1fe983edb7 Merge "Fix compat change CTS test flakiness" am: bb0db1d243 am: 3d1cfa54d6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440635

Change-Id: I611aae09d53d4b81b00f91a0edf08c9c83fa12b8
2020-09-30 13:07:11 +00:00
Lorenzo Colitti
3a463815e2 Merge changes I53ca4b98,I1757fdeb
* changes:
  Fix OffloadHardwareInterfaceTest.
  tethering: offload: Netlink Req NfGen
2020-09-30 12:53:57 +00:00
Kyunglyul Hyun
790edb871f Merge "[Media ML] public alternative for MediaController#controlsSameSession" 2020-09-30 12:34:37 +00:00
Neil Fuller
02d943f44d Get ready to add System APIs for use by SUW
This commit introduces the TimeManager API class. It is intended to
provide access to the time and time zone detector services, which
historically have had their own (internal) API classes to access them.

This commit contains various fixes to the listener handling logic
noticed while testing the APIs.

The first APIs on TimeManager are being exposed for use by SetUp Wizard,
which requires System APIs.

The APIs enable the calling app to determine the capabilities for /
config of the current user that affect time zone detection and then
alter them.

The primary usecase:

The rules for who can do what and when for time zone detection are
becoming more complicated, and device and user capabilities will be
affected by compile time constants, device config (resources) and device
hardware. By exposing this API, the complex logic can be encoded in one
place (the system server), rather than duplicating them in multiple
client apps.

These APIs are also intended for use by SettingsUI (and the various form
factor versions of that), but settings apps do not currently require
them to be marked with @SystemApi.

Bug: 159891384
Test: atest services/tests/servicestests/src/com/android/server/timezonedetector/
Test: atest android.app.time
Change-Id: I9b59099748e2391c180e124edf83fa521beb1b51
2020-09-30 13:34:05 +01:00
Andrei-Valentin Onea
3d1cfa54d6 Merge "Fix compat change CTS test flakiness" am: bb0db1d243
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440635

Change-Id: I0b32b7631d7f9ceade3e170d53ba068db924e85f
2020-09-30 12:31:11 +00:00
Andrei-Valentin Onea
bb0db1d243 Merge "Fix compat change CTS test flakiness" 2020-09-30 12:13:24 +00:00
Tobias Thierer
78733751fe Merge "DataChangedJournal: Make nonfinal to partially fix a test breakage." 2020-09-30 11:51:22 +00:00
Anton Hansson
140a18a403 Merge "Add genrules for merged removed.txt files" am: 19189d886b am: 554cdd7792 am: b16f6fed44 am: 41c5dbb0dd am: ccc36d6a46
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1438691

Change-Id: I99c9e633a872715c3136f2c9293ca1b1ac06bdbe
2020-09-30 11:50:30 +00:00
Anton Hansson
ccc36d6a46 Merge "Add genrules for merged removed.txt files" am: 19189d886b am: 554cdd7792 am: b16f6fed44 am: 41c5dbb0dd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1438691

Change-Id: Id35b4219ec4e944c80105e6008c12210036d40a7
2020-09-30 11:32:38 +00:00
Anton Hansson
41c5dbb0dd Merge "Add genrules for merged removed.txt files" am: 19189d886b am: 554cdd7792 am: b16f6fed44
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1438691

Change-Id: If5a19712bdceb5cc60eea4ba6cccdd830114cd4c
2020-09-30 11:09:32 +00:00
Anton Hansson
b16f6fed44 Merge "Add genrules for merged removed.txt files" am: 19189d886b am: 554cdd7792
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1438691

Change-Id: I472ffc39686ef7b895509140ff13a917ec882556
2020-09-30 10:51:21 +00:00
Neil Fuller
7e11d634fc Merge "Add a new permission in AOSP" am: 4b22e7c281 am: 1f728acac0 am: 8a0ce64177 am: 75ae324fb9 am: 7a3481c35c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440636

Change-Id: I3a2b428be82d029c3cb7c8fa9b3102dd62eec8dc
2020-09-30 10:30:38 +00:00
Anton Hansson
554cdd7792 Merge "Add genrules for merged removed.txt files" am: 19189d886b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1438691

Change-Id: I29ccf915258c276def7571b6574ce19256e770b7
2020-09-30 10:15:24 +00:00
Neil Fuller
7a3481c35c Merge "Add a new permission in AOSP" am: 4b22e7c281 am: 1f728acac0 am: 8a0ce64177 am: 75ae324fb9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440636

Change-Id: Id9f67ecab2beabe967660b5a4407ef0f20d8efad
2020-09-30 10:15:21 +00:00
Neil Fuller
4373cecd8b Refactoring to make adding a secondary easier
This commit contains refactorings intended to make the addition of a
secondary LocationTimeZoneProvider easier and clearer.

This change contains various refactorings to code and comments:
1) Start referring to the provider as the primary in some places.

2) Move the initialization timeout tracking to the
LocationTimeZoneProvider so each provider can be responsible for
tracking its own initialization timeout, giving the controller less to
do.

3) The PROVIDER_STATE_ENABLED has been split into _INITIALIZING,
_CERTAIN and _UNCERTAIN variants which are determined by the most recent
event the provider has sent. The controller therefore doesn't need
to track this either.

4) Introduction of a "single runnable" for the uncertainty timeout
managed by the ControllerImpl.

5) Many ControllerImplTest changes resulting from all the above and to
maximize tests readability.

Bug: 152744911
Bug: 149014708
Test: atest services/tests/servicestests/src/com/android/server/location/timezone/
Change-Id: I64b9cc33c5f97f2edb1063a8133434bfd8e9dda1
2020-09-30 11:09:25 +01:00
Neil Fuller
75ae324fb9 Merge "Add a new permission in AOSP" am: 4b22e7c281 am: 1f728acac0 am: 8a0ce64177
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440636

Change-Id: I0c4deb866e86feb77fe898e4bf643cd45ad9f086
2020-09-30 09:51:55 +00:00
Anton Hansson
19189d886b Merge "Add genrules for merged removed.txt files" 2020-09-30 09:51:17 +00:00
Neil Fuller
8a0ce64177 Merge "Add a new permission in AOSP" am: 4b22e7c281 am: 1f728acac0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440636

Change-Id: I2a65d7c9a91f5b3f5772ba8b2b199bfe3096077b
2020-09-30 09:35:03 +00:00
Neil Fuller
8e612b1d1d Merge "Fix some errorprone warnings" 2020-09-30 09:25:41 +00:00
Neil Fuller
1f728acac0 Merge "Add a new permission in AOSP" am: 4b22e7c281
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440636

Change-Id: If94e223edc16f738af9626445b6727ad42cae151
2020-09-30 08:59:55 +00:00
Sahana Rao
8bf78650b2 Revert "Set ENABLE_DYNAMIC_PERMISSIONS = false until ag/12511042 is ready."
This reverts commit 30694a0eab.

Reason for revert: ag/12511042 is now merged

Bug: 115619667
Bug: 159995598
Bug: 159501682
Change-Id: I413ccf8c31de6525a737c8336a904456fdbeb9e1
2020-09-30 08:51:44 +00:00
Neil Fuller
4b22e7c281 Merge "Add a new permission in AOSP" 2020-09-30 08:39:53 +00:00
Neil Fuller
770f5ab2db Add a new permission in AOSP
This adds a new permission in AOSP, so it can be referenced by the Shell
command, which presubmit suggests has to be maintained in AOSP.

Bug: 159891384
Test: build only
Exempt-From-Owner-Approval: jsharkey@ approved but it appears to have reset...?
Change-Id: Ic7d403e20731e9d6bd82d5b2e2758cc61989cc59
2020-09-30 08:39:25 +00:00
Lorenzo Colitti
966e522cff Fix OffloadHardwareInterfaceTest.
r.android.com/1424920 changed the code but forgot to update the
unit test.

Also fix some lint errors.

Bug: 149109043
Test: atest TetheringTests TetheringPrivilegedTests
Change-Id: I53ca4b9877dcb4a759dee6ec63133653315d826f
2020-09-30 17:04:19 +09:00
Ioana Stefan
92e0fc776b Merge "Add proto2 files for dump of server-side IME classes" 2020-09-30 07:47:54 +00:00
Tyler Wear
5abc17f390 tethering: offload: Netlink Req NfGen
Add the netfilter generic message header to
the netlink req. This is needed so the kernel
won't ignore the request for invalid params.

Bug: 149109043
Test: ConntrackSocketTest
Change-Id: I1757fdeb11a0cac5821021a22323cbd74fe22bdc
2020-09-30 15:07:47 +09:00