Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
674,652 Commits 3 Branches 0 Tags
74e94100b0883ffb1672d8fa5a670ef364f5c8a7
Commit Graph

21498 Commits

Author SHA1 Message Date
Treehugger Robot
3adc4cd7ed Merge "Avoid full unparcelling where possible in Bundle" am: 3ad4ecc296 am: 3aaf984908 am: cb329ca948 am: 7b03023777 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842226

Change-Id: I4869c4f65d882144b7fbc964ebee1201fe0887b9
 2021-10-06 13:10:23 +00: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
Alex Johnston
fc56413956 Merge "Revert "Revert "Cherrypicking flags and override methods for all..."" am: 5c35d3bce6 am: c8c3e89dce am: 82b82e3a73 am: 60be94ef59 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845059

Change-Id: I35c83a5cc36ea49d4c39f384a4e76c5da6bdb0ab
 2021-10-05 15:55:22 +00: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
Jacky Kao
d393be2b1a Merge "Revert "Cherrypicking flags and override methods for allowing dy..."" am: 98ff8ecdaa am: 1a894180c9 am: 9403386966 am: c3404a20aa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842721

Change-Id: I726d14661ab9ae6907b36d136c70c44608801550
 2021-10-05 13:19:58 +00:00
Jacob Hobbie
7647fb5742 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 am: 56fe73076c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1836473

Change-Id: Id69fafd0715aa4237c3bd84310217a6ea0f8e248
 2021-10-05 13:19:25 +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
Chilun Huang
4284584806 Merge "Use post-execution state for ActivityResultItem" into sc-v2-dev am: 69c8b1aef6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15903209

Change-Id: I6330be93ae95ff038f4d0a9b15da37040dbbd7d9
 2021-10-05 07:49:13 +00:00
Chilun Huang
69c8b1aef6 Merge "Use post-execution state for ActivityResultItem" into sc-v2-dev 2021-10-05 07:31:59 +00:00
Wei Sheng Shih
d005d9f546 Merge "Fix two typos on comment." into sc-v2-dev am: 6717096333 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15918347

Change-Id: I981f1a0f6d1b49152d54e58414a2135ebb466f62
 2021-10-05 03:13:58 +00:00
Wei Sheng Shih
6717096333 Merge "Fix two typos on comment." into sc-v2-dev 2021-10-05 03:08:29 +00:00
Louis Chang
3822f80d31 Merge "Removing TaskFragment token from LaunchActivityItem" into sc-v2-dev am: 5df8cac564 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15937027

Change-Id: I956d0cf59bdd8dcb8a96cd7c6f023ed724575d6b
 2021-10-05 03:05:51 +00:00
Louis Chang
5df8cac564 Merge "Removing TaskFragment token from LaunchActivityItem" into sc-v2-dev 2021-10-05 03:00:24 +00: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
Miranda Kephart
63850017f6 Merge "Offset ghost views by the containing view's location" into sc-v2-dev am: a7d22696a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15611765

Change-Id: I50d7925ea7d904ac746607307beb3546e93f4399
 2021-10-04 15:04:49 +00:00
Miranda Kephart
a7d22696a5 Merge "Offset ghost views by the containing view's location" into sc-v2-dev 2021-10-04 14:53:49 +00:00
Nick Chameyev
020ae864e1 Merge "Rename shouldUseDefaultDeviceStateChangeTransition attribute" into sc-v2-dev am: 3d984a776f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15947495

Change-Id: I1791f2c192bccfdce899665e6643700e135f8f10
 2021-10-04 10:01:15 +00:00
Chilun
3e0f315f8c Use post-execution state for ActivityResultItem 
onActivityResult was called before onStart when resuming an activity
from STOPPED state.

Ensure the onActivityResult callback to be called before onResume.
But we only fix this after Android S to avoid some app compatibility
issues.

Bug: 78294732
Bug: 130178098
Test: atest ActivityLifecycleTests
Change-Id: I9ff060ff26d3fc517aae0a094fc041887326a963
 2021-10-04 17:09:36 +08:00
Nick Chameyev
3d984a776f Merge "Rename shouldUseDefaultDeviceStateChangeTransition attribute" into sc-v2-dev 2021-10-04 09:00:00 +00:00
TreeHugger Robot
89ecd315be Merge "Don't ret admin info from createAdminSupportIntent" into sc-qpr1-dev am: 66b1090499 am: 35700e13a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15843713

Change-Id: Iaa7eabfa925c572952620bdf50b3a64382a4217b
 2021-10-01 18:24:26 +00:00
TreeHugger Robot
ed8da6fc5f Merge "Don't ret admin info from createAdminSupportIntent" into sc-qpr1-dev am: 66b1090499 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15843713

Change-Id: I215629f6a299254641cf6ff5c111787ac2e8b0d1
 2021-10-01 18:21:22 +00:00
TreeHugger Robot
35700e13a7 Merge "Don't ret admin info from createAdminSupportIntent" into sc-qpr1-dev am: 66b1090499 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15843713

Change-Id: Iac3eb4af4d48a5187091e67060e3de8abe160040
 2021-10-01 18:17:16 +00:00
TreeHugger Robot
66b1090499 Merge "Don't ret admin info from createAdminSupportIntent" into sc-qpr1-dev 2021-10-01 18:15:57 +00:00
TreeHugger Robot
8463df1a9a Merge "Added a DevicePolicyManager.setDeviceOwnerOnly() method." into sc-v2-dev am: 442864cace 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936907

Change-Id: I3d7b55594c0c37c3578c10a5f7fb04208717bb89
 2021-10-01 15:51:39 +00:00
TreeHugger Robot
442864cace Merge "Added a DevicePolicyManager.setDeviceOwnerOnly() method." into sc-v2-dev 2021-10-01 15:37:15 +00:00
Nick Chameyev
5985d390d6 Rename shouldUseDefaultDeviceStateChangeTransition attribute 
Renames the shouldUseDefaultDeviceStateChangeTransition attribute name to
shouldUseDefaultDisplayStateChangeTransition to make it less generic.

Test: manual
Fixes: 200698833
Change-Id: Ib6f90bcba2e75485e954bdbc1833fd67728e51c6
 2021-09-30 11:39:03 +00:00
TreeHugger Robot
b08043a76d Merge "API renaming asked by API Council" into stage-aosp-master am: d7cef086ca am: cbb7188ae0 am: d0bfa4c226 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934238

Change-Id: Ic8e6b2bf6aac93bb8db6d658cbce43b2d8d36d03
 2021-09-29 17:13:34 +00:00
TreeHugger Robot
d0bfa4c226 Merge "API renaming asked by API Council" into stage-aosp-master am: d7cef086ca am: cbb7188ae0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934238

Change-Id: I151133e723e08ae9bb222970f5ffd81fc9880cd3
 2021-09-29 17:12:59 +00:00
TreeHugger Robot
cbb7188ae0 Merge "API renaming asked by API Council" into stage-aosp-master am: d7cef086ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934238

Change-Id: Ie556f989ac6ce680b7de6caf37d71c6632ac927b
 2021-09-29 17:00:13 +00:00
Felipe Leme
895f3ba3f0 Added a DevicePolicyManager.setDeviceOwnerOnly() method. 
It will be used by the test infra to just set the device owner,
without setting the profile owner on current user on systems
using headless system user.

Test: atest com.android.cts.devicepolicy.DeviceOwnerTest#testDeviceOwnerSetup
Test: adb shell dpm set-device-owner --user 0 --device-owner-only com.afwsamples.testdpc/.DeviceAdminReceiver
Test: m update-api

Fixes: 201313785
Bug: 192395248

Change-Id: I41c2cf187c1eceebe7c6ef30f9cff693b9dcbc15
 2021-09-29 09:30:53 -07:00
Etienne Ruffieux
4c70432d82 API renaming asked by API Council 
Renamed all "cancelled" to "canceled" for PendingIntent.

Tag: #feature
Bug: 201405682
Test: atest android.app.cts.PendingIntentTest#testCancelListener
Change-Id: I0f5457f58836c6e80845dcd4d874a810008a320e
 2021-09-29 13:08:09 +00:00
Louis Chang
6dc124025d Removing TaskFragment token from LaunchActivityItem 
The token was needed because the TaskFragment info may not
sent to the organizer before activity created.

The token is no longer necessary because the TaskFragment
info is now ensured to be updated before activity created.

Bug: 200303250
Test: wm presubmit
Change-Id: I69a42fa35efde4fc7f37ab50334de5de146da90d
 2021-09-29 13:53:43 +08:00
TreeHugger Robot
347557e905 Merge "[NGA v2] Reliable Visible Activity Lookup" into sc-v2-dev am: 80fcbc8fe0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15810445

Change-Id: Ibfce3c573e7cc136226599500e438527a1565075
 2021-09-28 18:02:38 +00:00
TreeHugger Robot
80fcbc8fe0 Merge "[NGA v2] Reliable Visible Activity Lookup" into sc-v2-dev 2021-09-28 17:50:34 +00:00
TreeHugger Robot
41a24f463c Merge changes from topic "expose-pending-intent" into stage-aosp-master am: b4f626d13e am: 78f1a9bf51 am: 4230a055d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15879511

Change-Id: I1f9814117187d712c4e5df8140d6ff62f06ebdf3
 2021-09-28 11:34:24 +00:00
Makoto Onuki
499e0307a2 Expose PendingIntent.addCancelListener am: 30bd1bb72d am: 81767ac876 am: 7baac81d13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15879510

Change-Id: I30b8bca4033f96ce54c68a60a819a2d1d9179f34
 2021-09-28 11:34:20 +00:00
TreeHugger Robot
4230a055d3 Merge changes from topic "expose-pending-intent" into stage-aosp-master am: b4f626d13e am: 78f1a9bf51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15879511

Change-Id: I66a50ffbae15636a6a2221f1b27b2449b724a26b
 2021-09-28 11:13:33 +00:00
Makoto Onuki
7baac81d13 Expose PendingIntent.addCancelListener am: 30bd1bb72d am: 81767ac876 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15879510

Change-Id: I8430547bd0a27020be5bcf2c99777f2e95b7b3e5
 2021-09-28 11:13:31 +00:00