Commit Graph

10870 Commits

Author SHA1 Message Date
Treehugger Robot
5ee34126e5 Merge "Removed BluetoothDevice#prepareToEnterProcess" am: e722500621 am: 8bc4a18d21 am: 881188aec1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856313

Change-Id: I40e1ab47302e382037e42fb4f456fd15ef1d7576
2021-10-18 22:18:05 +00:00
Treehugger Robot
881188aec1 Merge "Removed BluetoothDevice#prepareToEnterProcess" am: e722500621 am: 8bc4a18d21
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856313

Change-Id: Icfb47bbfd6a04323343d93cc4a7f636bc6c1f280
2021-10-18 22:05:26 +00:00
Treehugger Robot
e722500621 Merge "Removed BluetoothDevice#prepareToEnterProcess" 2021-10-18 21:37:57 +00:00
Treehugger Robot
821bb80688 Merge "Fix Configuration.diff documentation." am: f822fdf129 am: 1017b74861 am: dd769fedab
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856336

Change-Id: Iff381892048ab02b6df2d92dc8d2c687b9f7bc88
2021-10-18 03:11:49 +00:00
Treehugger Robot
dd769fedab Merge "Fix Configuration.diff documentation." am: f822fdf129 am: 1017b74861
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856336

Change-Id: Ib73d56621f5ba8f01917443a9aa1dd78812aa72c
2021-10-18 02:59:24 +00:00
Etienne Ruffieux
e8f2077fee Removed BluetoothDevice#prepareToEnterProcess
Tag: #feature
Bug: 200202780
Test: manual
Change-Id: I8d4be1da1bcb5b819c324f1a3a89c7dc317c31d6
2021-10-15 14:41:32 +00:00
Felka Chang
6829841745 Fix Configuration.diff documentation.
By using ActivityInfo.Config to annotate the return type of
Configuration.diff, it not only solves the wrong document but also
makes the documentation of Configuration.diff consist with
the documentation of Configuration.updateFrom.

The final result is the following.
```
Returns a bit mask indicating which configuration values have changed.
Value is either 0 or a combination of ActivityInfo.CONFIG_MCC,
ActivityInfo.CONFIG_MNC, ActivityInfo.CONFIG_LOCALE,
ActivityInfo.CONFIG_TOUCHSCREEN, ActivityInfo.CONFIG_KEYBOARD,
ActivityInfo.CONFIG_KEYBOARD_HIDDEN, ActivityInfo.CONFIG_NAVIGATION,
ActivityInfo.CONFIG_ORIENTATION, ActivityInfo.CONFIG_SCREEN_LAYOUT,
ActivityInfo.CONFIG_UI_MODE, ActivityInfo.CONFIG_SCREEN_SIZE,
ActivityInfo.CONFIG_SMALLEST_SCREEN_SIZE, ActivityInfo.CONFIG_DENSITY,
ActivityInfo.CONFIG_LAYOUT_DIRECTION, ActivityInfo.CONFIG_COLOR_MODE,
and ActivityInfo.CONFIG_FONT_SCALE
```

Test: make docs
Test: review reference/android/content/res/Configuration.html in
      out/target/common/docs/online-sdk-docs-docs.zip

Fixes: 171738297
Bug: 171716892
Change-Id: Iaa2ac25bc1269e4a9a625cce386f51984ffff923
2021-10-13 20:50:03 +08:00
Treehugger Robot
7b03023777 Merge "Avoid full unparcelling where possible in Bundle" am: 3ad4ecc296 am: 3aaf984908 am: cb329ca948
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842226

Change-Id: Ib1f1a23a5e3fcac9691db094f79e63b4415546b3
2021-10-06 12:55:15 +00:00
Treehugger Robot
cb329ca948 Merge "Avoid full unparcelling where possible in Bundle" am: 3ad4ecc296 am: 3aaf984908
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842226

Change-Id: I598b562401860e5e838f891eb2944e49becc2fe6
2021-10-06 12:35:43 +00:00
Treehugger Robot
3aaf984908 Merge "Avoid full unparcelling where possible in Bundle" am: 3ad4ecc296
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842226

Change-Id: I0aef93d99d83f20b22753e8e1d41cfb5c4b5cdce
2021-10-06 12:25:47 +00:00
Treehugger Robot
3ad4ecc296 Merge "Avoid full unparcelling where possible in Bundle" 2021-10-06 12:06:59 +00:00
Treehugger Robot
5476b13b48 Merge "Fixing a build breakage caused by an incorrect link. Version code for Android T doesn't exist yet, removing the link." am: 6a0afe1846 am: 3b449c249f am: 407c8c4fc5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845234

Change-Id: Id6878f9cd849ec9ce6b2c582f5a640ef185774cf
2021-10-05 23:21:57 +00:00
TreeHugger Robot
c786f0e5ae Merge "Use AttributionSource Builder" into stage-aosp-master am: d34ebacb36 am: f81f06da29
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15889347

Change-Id: Ief894f1e36ddabdcfb9efe851ade4332ffcd9bac
2021-10-05 23:20:27 +00:00
Treehugger Robot
407c8c4fc5 Merge "Fixing a build breakage caused by an incorrect link. Version code for Android T doesn't exist yet, removing the link." am: 6a0afe1846 am: 3b449c249f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845234

Change-Id: Ibbd974649418e4cc97668992be4af09026ff88d6
2021-10-05 18:49:07 +00:00
Treehugger Robot
3b449c249f Merge "Fixing a build breakage caused by an incorrect link. Version code for Android T doesn't exist yet, removing the link." am: 6a0afe1846
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845234

Change-Id: I8249e3a7426ee9f3d2d22ba6ae093d217980acc2
2021-10-05 18:36:56 +00:00
TreeHugger Robot
f81f06da29 Merge "Use AttributionSource Builder" into stage-aosp-master am: d34ebacb36
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15889347

Change-Id: I4406ed3171a05afc52155faeb226fe4b66da2735
2021-10-05 17:32:24 +00:00
TreeHugger Robot
d34ebacb36 Merge "Use AttributionSource Builder" into stage-aosp-master 2021-10-05 17:17:13 +00:00
Jacob Hobbie
183e274d57 Fixing a build breakage caused by an incorrect link. Version code for
Android T doesn't exist yet, removing the link.

Test: presubmit, comments only, should just be "is build fixed"
Bug: 202151792
Change-Id: I2123f804aaed39eb7d31f25058c59a3c1df4d7d1
2021-10-05 09:11:39 -07:00
Alex Johnston
60be94ef59 Merge "Revert "Revert "Cherrypicking flags and override methods for all..."" am: 5c35d3bce6 am: c8c3e89dce am: 82b82e3a73
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845059

Change-Id: I042c8fbba177a506068183be34fe8a3d053ada99
2021-10-05 15:54:53 +00:00
Alex Johnston
82b82e3a73 Merge "Revert "Revert "Cherrypicking flags and override methods for all..."" am: 5c35d3bce6 am: c8c3e89dce
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845059

Change-Id: I3d56b09b853516237428e695a21ab263722952bd
2021-10-05 15:23:58 +00:00
Alex Johnston
c8c3e89dce Merge "Revert "Revert "Cherrypicking flags and override methods for all..."" am: 5c35d3bce6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845059

Change-Id: I90e8a4d567fe2de9ab765806fc7bd3aba4fe0845
2021-10-05 15:11:32 +00:00
Alex Johnston
4e8851d0d8 Revert "Revert "Cherrypicking flags and override methods for all..."
Revert "Revert "Required change for adding overload method for r..."

Revert submission 1842720-revert-1836473-receiverChangesinAOSP-FWJQDTADTI

Reason for revert: DroidMonitor-triggered revert due to breakage, bug b/202144225
Reverted Changes:
I03409ea39:Revert "Required change for adding overload method...
I583a11d2a:Revert "Cherrypicking flags and override methods f...

Change-Id: I5cdf9c74d51a259fdaa43dfdc9423d22145eac60
2021-10-05 14:57:10 +00:00
Bernardo Rufino
9e26212dac Avoid full unparcelling where possible in Bundle
and put a warning where it's not possible. This is to make sure we know
when to touch bundles provided by apps.

In this CL:
* deepCopy() now doesn't deserialize lazy objects before copying. It
  doesn't copy them either, it merely passes them into the new map as
  the same reference. This works because we implemented fine-grained
  locking into each lazy value, so concurrent access won't be a problem.
  Furthermore, LazyValue caches the deserialized object, so we'd still
  honor the contract of deepCopy() that "Other types of objects (such
  as Parcelable or Serializable) are referenced as-is and not copied in
  any way". I had to perform one extra check in the synchronized block
  in LazyValue to guarantee this (double-checked locking), I explain
  that in the comments.
* Removed filterValues() and codepaths that used it. This was created
  with the purpose of removing items whose classes weren't available to
  the system to prevent crashes coming from full deserialization. This
  is not a concern anymore with lazy bundle, hence we can remove the
  codepaths altogether (see email for more details).
* Put warnings in javadoc of getMap() and PeristableBundle().

Test: Boots
Test: atest -d android.os.cts.ParcelTest android.os.cts.BundleTest android.os.BundleTest android.os.ParcelTest
Bug: 195622897
Change-Id: I14bb6a7874814f42cbcc6b5fd372c42752aa74c8
2021-10-05 13:39:36 +01:00
Jacky Kao
c3404a20aa Merge "Revert "Cherrypicking flags and override methods for allowing dy..."" am: 98ff8ecdaa am: 1a894180c9 am: 9403386966
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842721

Change-Id: I2bf6d7e1885ac56e79111263f6de6e44dbf1e18c
2021-10-05 02:29:33 +00:00
Jacky Kao
9403386966 Merge "Revert "Cherrypicking flags and override methods for allowing dy..."" am: 98ff8ecdaa am: 1a894180c9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842721

Change-Id: Icdc4fc061e2b7208fdc6d4e17da860e47bc4548a
2021-10-05 02:19:52 +00:00
Jacky Kao
1a894180c9 Merge "Revert "Cherrypicking flags and override methods for allowing dy..."" am: 98ff8ecdaa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842721

Change-Id: Ieaed4fcc2fa97db551a70f4a3076b4237acfb8ab
2021-10-05 02:08:29 +00:00
Jacob Hobbie
56fe73076c Merge "Cherrypicking flags and override methods for allowing dynamically registered receivers to mark themselves explicitly as exported or not exported." am: 316e0e8336 am: 7e5da1ee2e am: 060b377211
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1836473

Change-Id: I2ab664531cdf77d597ff19ccff5abadf30215862
2021-10-05 01:56:58 +00:00
Jacky Kao
0827cf0cca Revert "Cherrypicking flags and override methods for allowing dy..."
Revert "Required change for adding overload method for registerR..."

Revert submission 1836473-receiverChangesinAOSP

Reason for revert: <INSERT REASONING HERE>
Reverted Changes:Making build break
I906ce9eb0:Required change for adding overload method for reg...
I9a16f566c:Cherrypicking flags and override methods for allow...

Change-Id: I583a11d2a23651db24acde303d522a5faae15c6b
2021-10-05 01:48:25 +00:00
Jacob Hobbie
060b377211 Merge "Cherrypicking flags and override methods for allowing dynamically registered receivers to mark themselves explicitly as exported or not exported." am: 316e0e8336 am: 7e5da1ee2e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1836473

Change-Id: I9cd085b98819b50bd520d44220b8b8dec9ce802c
2021-10-05 01:44:09 +00:00
Jacob Hobbie
7e5da1ee2e Merge "Cherrypicking flags and override methods for allowing dynamically registered receivers to mark themselves explicitly as exported or not exported." am: 316e0e8336
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1836473

Change-Id: I39049e42feb66c3fa3f0ebdef8e175ae86d5d410
2021-10-05 01:24:33 +00:00
Xin Li
8891d70334 Merge SP1A.210812.016
Merged-In: I8b62b9b9d7ae271bc623764d545db1320b4dc64f
Change-Id: I458ed7f2eb8603f5e89c1d73bc0f0d52b826973e
2021-09-28 19:26:36 +00:00
Varun Shah
12c61b00c0 Merge "Dismiss the suspend dialog if conditions have been modified." into sc-qpr1-dev am: 912d89451a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15853562

Change-Id: Ieead99da9e0ed20b30b9add94c8003ae69ef9424
2021-09-24 18:07:21 +00:00
Varun Shah
912d89451a Merge "Dismiss the suspend dialog if conditions have been modified." into sc-qpr1-dev 2021-09-24 17:54:45 +00:00
Jacob Hobbie
f76e50ba48 Cherrypicking flags and override methods for allowing dynamically
registered receivers to mark themselves explicitly as exported or not
exported.

Test: will add tests with enforcement
Change-Id: I9a16f566c54e389743dcf460734ecdc0b1081768
2021-09-23 08:20:04 -07:00
William Escande
c05e55ffbf Use AttributionSource Builder
Attribution source constructor are hidden api
Add a Builder option to take a AttributionSource as parameter

Test: atest BluetoothInstrumentationTests
Bug: 195144968
Tag: #refactor
Ignore-AOSP-First: No such thing on aosp
Change-Id: I901c8afff6a40bd8484fd8e10baf290aa483c280
2021-09-22 20:22:36 +02:00
TreeHugger Robot
6f246f6f01 Merge "Add warning for a known issue in a newly added API" into sc-qpr1-dev am: 697c7a819c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15583141

Change-Id: I944cc601dc1b0eab325f75581a3ff4a2da019b0a
2021-09-20 06:29:31 +00:00
TreeHugger Robot
697c7a819c Merge "Add warning for a known issue in a newly added API" into sc-qpr1-dev 2021-09-20 06:28:17 +00:00
Varun Shah
777d87f91b Dismiss the suspend dialog if conditions have been modified.
Whenever suspension conditions change, if there is a user-visible
suspension-related dialog, dismiss it to ensure the user is never
looking at stale information.

Bug: 169137795
Test: atest SuspendPackagesBroadcastTest#sendPackagesSuspendModifiedForUser
Test: manual (steps below)
-enable EBS, tap on suspended app to see dialog
-enable Focus mode, ensure dialog is dismissed
-tap on suspended app again to see relevent dialog,
 disable Focus mode, ensure dialog is dismissed
-tap on suspended app again to see relevant dialog,
 disable EBS, ensure dialog is dismissed correctly
-can permute enable/disable steps to further verify

Change-Id: Ib1650f910f7441498424ab4bc92185ce432ac405
(cherry picked from commit 25e73a8b9e)
2021-09-17 22:35:26 +00:00
Abhijeet Kaur
6fa7ca47ab Add warning for a known issue in a newly added API
checkUriPermissions is a new API added in Android S to check multiple
uri permissions via single API call.
However, checkUriPermissions is not working as intended for secondary
users. The root cause has been found and the fix is merged for later
releases.

Bug: 194700183
Test: atest --user-type secondary_user CtsScopedStorageDeviceOnlyTest:android.scopedstorage.cts.device.RedactUriDeviceTest#testSharedRedactedUri_openFileForRead
Change-Id: I72db7f0b4ddf97dce14880b6341799106d711c5c
2021-09-10 11:38:43 +00:00
Bill Yi
505f138725 Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE
Merged-In: If0c6aebc7ecb401d0f68a00a746f7ae337e4bb86
Merged-In: Ic4c9fc8a62966b7b171d4ff2185e3d3232dea2e0
Merged-In: Ic4c9fc8a62966b7b171d4ff2185e3d3232dea2e0
Change-Id: Ife6d981ebcc9d55b8b7f0089ef9af09a51ae87c5
2021-09-08 18:01:22 -07:00
Kevin Hufnagle
675a14ea2b docs: Fix links to narrative guides am: a1796499fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15738642

Change-Id: I41cdd3249c0d9ab80a314221dcc5af7ba51cc5ed
2021-09-01 17:33:44 +00:00
Kevin Hufnagle
a1796499fe docs: Fix links to narrative guides
Cannot use both `{@docRoot}` and leading `/` when specifying URLs

Bug: 197663210
Change-Id: If6762b95a3d6991b4732684853d974a06da032bc
Test: make ds-docs
Exempt-from-Owner-Approval: Docs-only change
2021-09-01 15:43:02 +00:00
Treehugger Robot
444b1e27b0 Merge "OverlayManager: use typed collection type in AIDL" am: 497e28ecf3 am: c1a5b99f86
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1801774

Change-Id: I73df9c8a2133c93b92e20d9357013f86023b93f6
2021-08-24 02:14:18 +00:00
Treehugger Robot
c1a5b99f86 Merge "OverlayManager: use typed collection type in AIDL" am: 497e28ecf3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1801774

Change-Id: I2c504229c8251d5429d9105a1a6f6dfedb788cb7
2021-08-24 02:03:04 +00:00
Jooyung Han
8ed699e610 OverlayManager: use typed collection type in AIDL
Use Map<K,V> and List<V>.

Bug: 192615532
Test: m
Change-Id: I5ad7f67b4b08b646362a58214c3b62cd1ada28c0
2021-08-19 15:56:48 +09:00
Treehugger Robot
affce2a5bc Merge "Update OWNERS for Intent* and Content*" am: 6e3ea69863 am: 82a84c8c8d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1799046

Change-Id: Ide71c74d49f328a634c890a9afd3dcfd25faf420
2021-08-17 23:43:57 +00:00
Treehugger Robot
82a84c8c8d Merge "Update OWNERS for Intent* and Content*" am: 6e3ea69863
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1799046

Change-Id: Icea95dd713a074ecad5e7fcf4ab001e6e780db47
2021-08-17 23:27:51 +00:00
Makoto Onuki
ea8407635c Update OWNERS for Intent* and Content*
Test: Build
Change-Id: I2232342d3e68cc8e1eea14bfa999f32b15ba5789
2021-08-17 14:27:35 -07:00
Ray Essick
4cfe431f14 Rename android.media.MediaTranscodeManager -> MediaTranscodingManager
renamed to avoid conflict with existing copy in the R framework.jar.
The framework.jar copy was removed during S development

Bug: 195608856
Test: build
Test: cts-tradefed run cts -m CtsMediaTranscodingTestCases
Change-Id: I40ab066cd61be8d278f21cc788016f2edd6bb86e
(cherry picked from commit 1168d9d014)
2021-08-17 01:09:58 +00:00
Ray Essick
e1906a6dc8 Merge "Rename android.media.MediaTranscodeManager -> MediaTranscodingManager" into sc-dev am: 9d0e91c7b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15521772

Change-Id: I02cccd46608894c908ccbcf8e1d0fe3bf4a5af6a
2021-08-12 18:27:55 +00:00