Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
726,405 Commits 3 Branches 0 Tags
f483aae674e549320389fa648d56d91ddbab9dff
Commit Graph

11338 Commits

Author SHA1 Message Date
Treehugger Robot
dde83e104c Merge "Fix Configuration.diff documentation." am: f822fdf129 am: 1017b74861 am: dd769fedab am: 821bb80688 am: ba48efd251 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856336

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

Change-Id: I22b542ada2d4126d4a4f20dc459f4624c9320ddc
 2021-10-18 03:26:18 +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
Lucas Silva
2f9962d681 Merge "Add new system service which enforces SLS allowlist." 2021-10-18 00:13:01 +00:00
Jeremy Meyer
6f8b71e87a Revert "Have AssetFileDescriptor.AutoCloseInputStream use pread" 
Revert "Add cts test to verify 2 AssetFileDescriptors work indep..."

Revert submission 15961171-168310122

Reason for revert: breaks presubmit tests
Reverted Changes:
I6c9f9d1de:Have AssetFileDescriptor.AutoCloseInputStream use ...
I061bf9ab4:Add cts test to verify 2 AssetFileDescriptors work...

Change-Id: Ib22b0fef51e7ac203ceb04f8d8a398829e0149b8
 2021-10-15 21:56:42 +00:00
Lucas Silva
2bc99eb334 Add new system service which enforces SLS allowlist. 
The new service will intercept all activity starts in communal mode and
enforce that the activity is allowed by ensuring the user has enabled
the package and the activity has showWhenLocked=true.

Test: locally on device
Test: atest FrameworksMockingServicesTests:CommunalManagerServiceTest
Bug: 191994709
Bug: 191996331
Bug: 200324021
Change-Id: I1892881481cf055bd4938d4cf0b624027ec2be3e
 2021-10-15 19:15:46 +00:00
Jeremy Meyer
9d0352210d Have AssetFileDescriptor.AutoCloseInputStream use pread 
Previously two AssetFileDescriptors pointing to the same file could be
using the same underlying file descriptor and reading from both would
provide unexpected results since they would both modify the file offset
in the kernel data structure.

Test: Added testTwoFileDescriptorsWorkIndependently() to
android.content.res.cts.AssetFileDescriptor_AutoCloseInputStreamTest
Test: atest AssetFileDescriptor_AutoCloseInputStreamTest
Fix: 168310122

Change-Id: I6c9f9d1de193992736bf39516ab9364af34a47cd
 2021-10-15 00:22:26 +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
Jeremy Meyer
669d486095 Merge "Make Configuration.generateDelta() public" 2021-10-12 15:53:15 +00:00
Jeremy Meyer
f459f57c22 Make Configuration.generateDelta() public 
Test: Added android.content.res.cts.ConfigurationTest.testGenerateDiff()
Test: atest ConfigurationTest
Fix: 141372186
Change-Id: I2210afd2473612daa6c4af77822916b040eaae92
 2021-10-07 17:39:31 +00:00
Yi-an Chen
8024507418 Merge "Add the intent for app service info page" 2021-10-07 16:20:30 +00:00
Treehugger Robot
09b464ec64 Merge "Avoid full unparcelling where possible in Bundle" am: 3ad4ecc296 am: 3aaf984908 am: cb329ca948 am: 7b03023777 am: 3adc4cd7ed 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842226

Change-Id: Id9e51b93592d0f53156d49107bde60d586eecd6f
 2021-10-07 01:27:08 +00:00
Yi-an Chen
91ab25204b Add the intent for app service info page 
Bug: 189480134

Test: Not needed yet. This is currently not used.
Change-Id: If96d8d09db0e7bd28dadf3196600124a4b7620c5
 2021-10-06 18:10:26 +00:00
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
Ankita Vyas
655e90e09e Merge "Add new LocaleManagerService and its shell commands" 2021-10-06 12:23:45 +00:00
Treehugger Robot
3ad4ecc296 Merge "Avoid full unparcelling where possible in Bundle" 2021-10-06 12:06:59 +00:00
“Ankita
f2d3022e5d Add new LocaleManagerService and its shell commands 
Ignore-AOSP-First: permission present in internal branch only

Test: tested manually via adb

Bug: 194094788
Bug: 194484378

Change-Id: I413a74fc1b15d164de7f2098e975e0b792685394
 2021-10-06 05:25:43 +00:00
Treehugger Robot
17c961f08f 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 am: 5476b13b48 am: 043511f0b2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845234

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

Change-Id: If0f3080880fe98dbc316756e584eea20bc88dc4b
 2021-10-05 23:32:19 +00:00
Treehugger Robot
043511f0b2 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 am: 5476b13b48 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845234

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

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

Change-Id: I2776316788a1f5b751a7710dcc8e7f638efd9a13
 2021-10-05 16:11:34 +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
Winson Chiu
0d1f78a2ca Merge "Encapsulate PackageUserState fields" 2021-10-05 15:31:46 +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
79826db72e Merge "Revert "Cherrypicking flags and override methods for allowing dy..."" am: 98ff8ecdaa am: 1a894180c9 am: 9403386966 am: c3404a20aa am: d393be2b1a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842721

Change-Id: Ied92ecef9f3ad12e0d943c82a3cbe9fd9f206f16
 2021-10-05 13:37:07 +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
Ankita Vyas
699d0fa27e Merge "Add new broadcast intent action APPLICATION_LOCALE_CHANGED and extra LOCALE_LIST." 2021-10-05 04:42:23 +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