Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
530,366 Commits 3 Branches 0 Tags
04dede7600a0da25fa29fedd9a9ae493bfc0bf0c
Commit Graph

530366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Tyler Gunn
ea7ef4ad2a Backport sendBroadcastAsUserMultiplePermissions to oc-dev 
Bug: 159373687
Test: Verify Settings still works correctly.

Change-Id: I857ea00cc58a0abbb77960643f361dd6dd9c8b56
Merged-In: I857ea00cc58a0abbb77960643f361dd6dd9c8b56
 2020-09-29 21:52:45 +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
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
0b7a97fc80 Merge "Add read/write logic for SubscriptionPlan network types field" into rvc-d1-dev am: 76b7c3ccb4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12691247

Change-Id: Iab79d997aaeec0524cf9f2d9fb61f3c1ce0afa71
 2020-09-29 17:58:01 +00:00
Brad Ebinger
aea9e7c143 Merge "Clean up IMS based interfaces to use a push model instead of poll" 2020-09-29 17:56:22 +00:00
Sarah Chin
76b7c3ccb4 Merge "Add read/write logic for SubscriptionPlan network types field" into rvc-d1-dev 2020-09-29 17:41:54 +00:00
Treehugger Robot
a097f75405 Merge "Fix override setBufferCount" am: 378fa1b4c2 am: 736519b8c4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1441702

Change-Id: I219352a252a5fa4e083916d7837663decb093c45
 2020-09-29 17:32:53 +00:00
TreeHugger Robot
dd0c3c1946 Merge "Camera: Clarify SCALER_CROP_REGION usage" into rvc-dev am: 601e34fdd7 am: 794e42e566 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12586676

Change-Id: I7b1bcf3624aca31391c32167005a8d49bbf2ccb9
 2020-09-29 17:32:44 +00:00
TreeHugger Robot
f5c645e8a2 Merge "Camera: Clarify SCALER_CROP_REGION usage" into rvc-dev am: 601e34fdd7 am: bf6e731010 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12586676

Change-Id: I8a0f378dd8a8ff5709783edaba56a89e5253398d
 2020-09-29 17:10:38 +00:00
Treehugger Robot
4b664e7ca0 Merge changes I7907f0a3,Iec46c80b am: 4d233a83b7 am: 60d7707016 am: 0ca8b033dd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433915

Change-Id: Iaba4bff0265654c729bbd32d15294b65b3915d24
 2020-09-29 17:10:24 +00:00
TreeHugger Robot
bf6e731010 Merge "Camera: Clarify SCALER_CROP_REGION usage" into rvc-dev am: 601e34fdd7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12586676

Change-Id: I75a21c0eb76f5245776c1c3fb02711839118078e
 2020-09-29 17:09:37 +00:00
TreeHugger Robot
794e42e566 Merge "Camera: Clarify SCALER_CROP_REGION usage" into rvc-dev am: 601e34fdd7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12586676

Change-Id: I0ba79c5a129932dd805bb3dbda49f58702631d3d
 2020-09-29 17:09:26 +00:00
Treehugger Robot
736519b8c4 Merge "Fix override setBufferCount" am: 378fa1b4c2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1441702

Change-Id: I94bb62e65da876c65efaf88bb19f55cf67c3a593
 2020-09-29 17:02:01 +00:00
Andrei Onea
34a78c50b0 Fix compat change CTS test flakiness 
Cleanup overrides in the PlatformCompatCommandNotInstalledTest test.

Test: atest PlatformCompatCommandNotInstalledTest
Test: adb shell dumpsys platform_compat | grep override # is empty
Bug: 169235095
Change-Id: Ibd9f2801e8b4c571dca49f0682a8bc3b17ffd545
 2020-09-29 17:56:40 +01:00
TreeHugger Robot
601e34fdd7 Merge "Camera: Clarify SCALER_CROP_REGION usage" into rvc-dev 2020-09-29 16:42:57 +00:00
Treehugger Robot
0ca8b033dd Merge changes I7907f0a3,Iec46c80b am: 4d233a83b7 am: 60d7707016 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433915

Change-Id: Iea5ba64fd780aa1da32b129a0fd1b758631fe3a1
 2020-09-29 16:34:36 +00:00
Treehugger Robot
378fa1b4c2 Merge "Fix override setBufferCount" 2020-09-29 16:20:37 +00:00
Treehugger Robot
60d7707016 Merge changes I7907f0a3,Iec46c80b am: 4d233a83b7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433915

Change-Id: I536751f25c66be56eeab2f22e941a46ea80c3b96
 2020-09-29 15:49:31 +00:00
Treehugger Robot
4d233a83b7 Merge changes I7907f0a3,Iec46c80b 
* changes:
  When the mUri is null,it will happen NullPointerException.
  Ringtone uri should add type query
 2020-09-29 15:31:16 +00:00
Paul Duffin
0acdd44047 Merge "Get ART public API doctag information from java_sdk_library" am: 08e7cbb0b5 am: ec334d86e0 am: c0ea6a6330 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432683

Change-Id: I5762b92aef7e3e74f979801424a4bdf8d9eaf920
 2020-09-29 15:04:07 +00:00
Paul Duffin
471182f89e Merge "Use ART stubs source generated by java_sdk_library" am: b996945678 am: 54fa7623bc am: ad9299dcdb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1428569

Change-Id: Ib6e419074a06719594f48dd480a1276a9dde3dcf
 2020-09-29 15:03:53 +00:00
Mohammad Islam
bcd39eca7d Merge "Abandon sessions before/after running tests" am: 347e38a87b am: 6317806d3c am: 4327c4ec4b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433441

Change-Id: Ia3890f931d43a0a8fb744c2b94189a8d4bcba46b
 2020-09-29 15:03:06 +00:00
Paul Duffin
c0ea6a6330 Merge "Get ART public API doctag information from java_sdk_library" am: 08e7cbb0b5 am: ec334d86e0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432683

Change-Id: I7c4db44ba5606886c4e56ff3dfc0ab961b8fb7bf
 2020-09-29 14:43:03 +00:00
Paul Duffin
ad9299dcdb Merge "Use ART stubs source generated by java_sdk_library" am: b996945678 am: 54fa7623bc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1428569

Change-Id: Icf771c1a70f86d4338e80f93c520c8d73c281fcc
 2020-09-29 14:42:44 +00:00
Mohammad Islam
4327c4ec4b Merge "Abandon sessions before/after running tests" am: 347e38a87b am: 6317806d3c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433441

Change-Id: I5dfcf1c436b14d28db027f1300ce136fbc3f0e38
 2020-09-29 14:42:28 +00:00
Paul Duffin
ec334d86e0 Merge "Get ART public API doctag information from java_sdk_library" am: 08e7cbb0b5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432683

Change-Id: I9219118912ce6d2a752b4c22161a54f8c0c99d9c
 2020-09-29 14:22:32 +00:00
Paul Duffin
54fa7623bc Merge "Use ART stubs source generated by java_sdk_library" am: b996945678 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1428569

Change-Id: Ie8589733d60d35b3e06b2d514cfe0dd2e3167638
 2020-09-29 14:16:47 +00:00
Mohammad Islam
6317806d3c Merge "Abandon sessions before/after running tests" am: 347e38a87b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433441

Change-Id: I00a0a3fef73a5cdad39349a5ea3cc7d836d70f8c
 2020-09-29 14:12:03 +00:00
JW Wang
5b51c8c189 Rewrite how we abandon sessions 
The original code is flawed in that `pm install-abandon` only abandons
the 1st session returned by `pm get-stagedsessions ...`.

1. move AbandonSessionsRule to be shared by multiple host tests
2. use AbandonSessionsRule to do the job

Bug: 160754072
Test: StagedInstallInternalTest
Change-Id: Ib7b32fbd7b1133ac6a8e6782234a4fe2c5a782bd
Merged-In: Ib7b32fbd7b1133ac6a8e6782234a4fe2c5a782bd
(cherry picked from commit 3ac333f2d2)
 2020-09-29 15:03:20 +01:00
John Reck
d47a88f358 Fix override setBufferCount 
The logic in setBufferCount was still assuming it needed
to inject the extra buffers, however that injection was
already happening in the min_undequeued query. So it was
increasing buffercount by 2x the extraCount, or concretely
5 buffers when it should have been 4 on >75hz devices

Bug: 168928692
Test: Boot coral, verify 4 buffers instead of 5
Change-Id: I0908228a6791d90544fbf4cb21170931bd31a9db
Merged-In: I0908228a6791d90544fbf4cb21170931bd31a9db
 2020-09-29 06:59:06 -07:00
Paul Duffin
08e7cbb0b5 Merge "Get ART public API doctag information from java_sdk_library" 2020-09-29 13:55:53 +00:00
Paul Duffin
b996945678 Merge "Use ART stubs source generated by java_sdk_library" 2020-09-29 13:55:27 +00:00