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

557031 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Patrick Baumann
1bc593dc60 Fixes PM.grantImplicitAccess for multi-user am: 7494002c94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12729198

Change-Id: I4bc339b413af79bfea596a361e2f93609084b65f
 2020-09-30 19:17:28 +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
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
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
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
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
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
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
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
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
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
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
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
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
Nathan Harold
32f7c492fc Merge "Deprecate CellLocation Classes" am: 27b3384102 am: b92bb8e643 am: 5d8e5249d6 am: febf87fde1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1429088

Change-Id: Ib97a5d6c10c47d7213c0a9a17ebcb0144079fdb5
 2020-09-30 01:05:12 +00:00
Nathan Harold
febf87fde1 Merge "Deprecate CellLocation Classes" am: 27b3384102 am: b92bb8e643 am: 5d8e5249d6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1429088

Change-Id: I3804f270dbe9707ef70e8b6c43675e45fac6c0e6
 2020-09-30 00:43:03 +00:00
Nathan Harold
5d8e5249d6 Merge "Deprecate CellLocation Classes" am: 27b3384102 am: b92bb8e643 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1429088

Change-Id: I06610c58d489d894f6211f9b1b56c3f5d365f7ba
 2020-09-30 00:30:19 +00:00
Jean-Michel Trivi
0a2fb51a9e Merge "Use the try catch to deal with the StaleDataException." am: 1fa847ad64 am: 15698dd32d am: 4b16237ab7 am: d715c91c2a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433917

Change-Id: I910b327fba414ae7ce3574acc078a0af40756b87
 2020-09-30 00:07:29 +00:00
Nathan Harold
b92bb8e643 Merge "Deprecate CellLocation Classes" am: 27b3384102 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1429088

Change-Id: I6d46fe77f5c7dff7d8e673c26b86c3f869e14914
 2020-09-29 23:43:27 +00:00
Jean-Michel Trivi
d715c91c2a Merge "Use the try catch to deal with the StaleDataException." am: 1fa847ad64 am: 15698dd32d am: 4b16237ab7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433917

Change-Id: I3013edfee1921ce0dce503355d0c866e345e7538
 2020-09-29 23:29:59 +00:00
Nathan Harold
27b3384102 Merge "Deprecate CellLocation Classes" 2020-09-29 23:23:59 +00:00
Jean-Michel Trivi
4b16237ab7 Merge "Use the try catch to deal with the StaleDataException." am: 1fa847ad64 am: 15698dd32d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433917

Change-Id: Ifc2e286c0d1fe184ad3cd21325424fc085bc79ce
 2020-09-29 23:12:34 +00:00
Jean-Michel Trivi
15698dd32d Merge "Use the try catch to deal with the StaleDataException." am: 1fa847ad64 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433917

Change-Id: I7785f21c7d67e3bdfcef03615993836297a99b50
 2020-09-29 22:50:26 +00:00
Jean-Michel Trivi
1fa847ad64 Merge "Use the try catch to deal with the StaleDataException." 2020-09-29 22:08:40 +00:00
Patrick Baumann
7494002c94 Fixes PM.grantImplicitAccess for multi-user 
This change fixes the security check in grantImplicitAccess to support
the case that the system user does not have an installed contacts
provider.

Fixes: 169684344
Test: atest android.provider.cts.contacts.ContactsContract_DirectoryTest
Change-Id: I2c80513a5dffa7ad92963e376ea85217f127f39a
 2020-09-29 20:26:04 +00:00
Brad Ebinger
3a0dd0df13 Merge "Clean up IMS based interfaces to use a push model instead of poll" am: aea9e7c143 am: a4f7362b23 am: d23e9a07b4 am: 7d08fa0c21 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1425374

Change-Id: I59da40b85a9587d0da471021219a47695f01e6f0
 2020-09-29 20:00:18 +00:00
Brad Ebinger
7d08fa0c21 Merge "Clean up IMS based interfaces to use a push model instead of poll" am: aea9e7c143 am: a4f7362b23 am: d23e9a07b4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1425374

Change-Id: Id2c4938f091bc46bf903cefd0cc2aea90aead7e8
 2020-09-29 19:32:24 +00:00
Brad Ebinger
d23e9a07b4 Merge "Clean up IMS based interfaces to use a push model instead of poll" am: aea9e7c143 am: a4f7362b23 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1425374

Change-Id: Ie394c55cde8fdd3b6adf7251d27832f4e0cdcb90
 2020-09-29 18:56:53 +00:00
Brad Ebinger
a4f7362b23 Merge "Clean up IMS based interfaces to use a push model instead of poll" am: aea9e7c143 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1425374

Change-Id: Ide1ba89adfb70b5951da39517ee46f553acb2be3
 2020-09-29 18:36:00 +00:00
Treehugger Robot
54a4d6429d [automerger skipped] Merge "Fix override setBufferCount" am: 378fa1b4c2 am: 736519b8c4 am: a097f75405 am: 684dcb20c6 -s ours 
am skip reason: Change-Id I0908228a6791d90544fbf4cb21170931bd31a9db with SHA-1 58f3306d05 is in history

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

Change-Id: I1fc666535e8012543149b4fda6e09946f54c3a63
 2020-09-29 18:33:43 +00:00
Sarah Chin
21814dffa4 Merge "Add read/write logic for SubscriptionPlan network types field" into rvc-d1-dev am: 76b7c3ccb4 am: 0b7a97fc80 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12691247

Change-Id: Id4793cae167d349ee26e7f4e38f2eb0926045d6a
 2020-09-29 18:32:55 +00:00
Treehugger Robot
684dcb20c6 Merge "Fix override setBufferCount" am: 378fa1b4c2 am: 736519b8c4 am: a097f75405 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1441702

Change-Id: Id72bda47c23650d9eb9edc305181455e03f5bb09
 2020-09-29 17:59:44 +00:00
guofei.xue
6695525f1b Use the try catch to deal with the StaleDataException. 
When test the monkey, the mCursor is not null and the mCursor is Closed.
So that the mCursor cannot call the method of moveToPosition. Otherwise
it will lead to StaleDataException.

In order to prevent the android.database.StaleDataException and IllegalStateException,
use the try catch to deal with the StaleDataException and IllegalStateException.

Test:Perform the monkey test, and See if this android.database.StaleDataException will happen again when call the method of android.media.RingtoneManager#getRingtoneUri.

Bug: 169292273

Change-Id: I577c41c6a4b0025ce562a2dc495a6f28b103cfaa
 2020-09-29 17:59:26 +00:00
Sarah Chin
41835f9549 Merge "Add read/write logic for SubscriptionPlan network types field" into rvc-d1-dev am: 76b7c3ccb4 am: 2ca98d2057 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12691247

Change-Id: Ie8d6396287d02c27d8860daa0a7d455f15d9a635
 2020-09-29 17:59:16 +00:00