Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
519,022 Commits 3 Branches 0 Tags
c19fd3c4cba0f02a1ef8a897a4aa6e00a6e3df93
Commit Graph

519022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tsung-Mao Fang
b192f20ed6 Add a space after bullet point is recommended am: 157cf557b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12068940

Change-Id: Ibeacf342cbb122d06b646a68a714cf62725687c3
 2020-07-10 13:17:20 +00:00
vichang
3b25f55042 Merge "Remove libcore.icu.ICU usage in android.text.format.DateFormat" am: ec71624f22 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1355737

Change-Id: If98b1ad06b4dd369cf271236ac16d3501c8a9d40
 2020-07-10 11:02:21 +00:00
vichang
ec71624f22 Merge "Remove libcore.icu.ICU usage in android.text.format.DateFormat" 2020-07-10 10:47:38 +00:00
Tsung-Mao Fang
157cf557b1 Add a space after bullet point is recommended 
Test: Rebuilt rom.
Fix: 156248378
Change-Id: Icc99587c35d58f2aaa7d52f152dc980ad09afdfd
 2020-07-10 10:32:46 +00:00
Tiger Huang
ff06666dba Update requested state by comparing with source consumer 
If the local state and mLastDispatchedState are the same, the logic in
onStateChanged will skip updating the requested state. This could be an
issue, for example, a new focused window requested to hide status bar,
but status bar has already been hidden by the previous focused window,
so the new focused window will never send the requested state to server.
This can easily happen when an immersive activity is re-created due to
the configuration change.

This CL updates the requested state if any visibility within it is not
the same as the requested visibility of the source consumer, while
receiving controls.

Fix: 160854328
Test: atest InsetsControllerTest
Test: Swipe to show transient bars after rotating an immersive activity
Change-Id: I5d9acb1b59252fa80e66070db86b2555764588da
 2020-07-10 18:04:57 +08:00
Mohammad Samiul Islam
3aa1f5aa16 Fix deadlock in StagingManager.getSessions() method 
When we stage a session we acquire the PackageInstallerSession#mLock
first and then StagingManager#mStagedSessions lock. But in getSessions()
method, we acquire the locks in reverse order which can lead to
deadlock: we first acquire StagingManager#mStagedSessions in
getSessions() and then while checking if session is destroyed, we
acquire PackageInstallerSession#mLock in isDestroyed() method.

By moving the staged session retrieval logic to PackageInstallerService,
we avoid acquiring the StagingManager#mStagedSession lock. This avoids
deadlock.

Bug: 160113544
Test: atest StagedInstallTest
Change-Id: I7a1abf44db27d4673d43e9b0886610a5bd8b41f6
Merged-In: I7a1abf44db27d4673d43e9b0886610a5bd8b41f6
(cherry picked from commit c45b6a146c)
 2020-07-10 10:02:39 +01:00
Treehugger Robot
57c6c1b17c Merge "Delete newFromCMT() and newFromCDS() from SmsMessage" am: b599edc541 am: b403b0877d am: 5850cbdfad 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359205

Change-Id: I298b098bb2b364973aa4dd542c26725b8906a218
 2020-07-10 07:28:21 +00:00
Treehugger Robot
5850cbdfad Merge "Delete newFromCMT() and newFromCDS() from SmsMessage" am: b599edc541 am: b403b0877d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359205

Change-Id: I05e4806aca68c0b42912834a6da1976443846c56
 2020-07-10 07:16:52 +00:00
Treehugger Robot
b403b0877d Merge "Delete newFromCMT() and newFromCDS() from SmsMessage" am: b599edc541 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359205

Change-Id: If6f43bcd579c4bf6baaf2b973d296c8ba3ac0c82
 2020-07-10 07:02:15 +00:00
Treehugger Robot
b599edc541 Merge "Delete newFromCMT() and newFromCDS() from SmsMessage" 2020-07-10 06:48:53 +00:00
Automerger Merge Worker
20c2b4677b Merge "Merge "Don't assume r.curApp is valid when finalizing broadcasts" into rvc-dev am: 33e8dc7978 am: def8dbfefc" into rvc-d1-dev-plus-aosp 2020-07-10 06:40:17 +00:00
TreeHugger Robot
47a91684b0 Merge "Don't assume r.curApp is valid when finalizing broadcasts" into rvc-dev am: 33e8dc7978 am: def8dbfefc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12088000

Change-Id: Id43c5108d21feeb6a0e566b40fbd29dd7faee8c4
 2020-07-10 06:40:08 +00:00
TreeHugger Robot
ee77a1bd52 Merge "Don't assume r.curApp is valid when finalizing broadcasts" into rvc-dev am: 33e8dc7978 am: b3f96855a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12088000

Change-Id: I7c6635be1fd6ee59bd6102130929665b8293c400
 2020-07-10 06:39:54 +00:00
TreeHugger Robot
def8dbfefc Merge "Don't assume r.curApp is valid when finalizing broadcasts" into rvc-dev am: 33e8dc7978 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12088000

Change-Id: I5d321d42f58cec37c6e9132887dbb94c37949f28
 2020-07-10 06:22:56 +00:00
TreeHugger Robot
b3f96855a8 Merge "Don't assume r.curApp is valid when finalizing broadcasts" into rvc-dev am: 33e8dc7978 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12088000

Change-Id: Id17f39477d07dbc3063a516244170dd748b020a7
 2020-07-10 06:22:31 +00:00
TreeHugger Robot
33e8dc7978 Merge "Don't assume r.curApp is valid when finalizing broadcasts" into rvc-dev 2020-07-10 06:08:50 +00:00
Treehugger Robot
d53e749e8a Merge "Revert "Attribute data usage to 5G for 5G non-standalone mode"" am: 13c5ee8313 am: 56df7e2c1a am: add913a0ae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360157

Change-Id: I76f64267c5cbe4516602f8526d6f8fee452c46bb
 2020-07-10 05:51:55 +00:00
Treehugger Robot
add913a0ae Merge "Revert "Attribute data usage to 5G for 5G non-standalone mode"" am: 13c5ee8313 am: 56df7e2c1a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360157

Change-Id: If052329128326fba72ff27c024a2c6652b7bb1ef
 2020-07-10 05:41:05 +00:00
Treehugger Robot
56df7e2c1a Merge "Revert "Attribute data usage to 5G for 5G non-standalone mode"" am: 13c5ee8313 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360157

Change-Id: I0b5da0e4e20cbd2dd5856b04d1f1ddfe3323b10b
 2020-07-10 05:26:41 +00:00
Treehugger Robot
13c5ee8313 Merge "Revert "Attribute data usage to 5G for 5G non-standalone mode"" 2020-07-10 05:13:17 +00:00
Chalard Jean
b9bfd74be1 [automerger skipped] Merge "Add some more public doc for MacAddress" into rvc-dev am: 2ddb47fa19 -s ours am: 64ea9534ba -s ours 
am skip reason: Change-Id I0f6e59eda42fd92ec34db0e9bc2d26d2e83d41d0 with SHA-1 ab8bdc0b89 is in history

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

Change-Id: Id150062dfb212e61f326084f8d65bb8d71f154f2
 2020-07-10 05:13:08 +00:00
Chalard Jean
1b19f5d87d [automerger skipped] Merge "Add some more public doc for MacAddress" into rvc-dev am: 2ddb47fa19 am: 64b59634a6 -s ours 
am skip reason: Change-Id I0f6e59eda42fd92ec34db0e9bc2d26d2e83d41d0 with SHA-1 ab8bdc0b89 is in history

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

Change-Id: I760d9a35c18ed1e5e603aac5a79c710585e16e3f
 2020-07-10 05:12:59 +00:00
Chalard Jean
64ea9534ba [automerger skipped] Merge "Add some more public doc for MacAddress" into rvc-dev am: 2ddb47fa19 -s ours 
am skip reason: Change-Id I0f6e59eda42fd92ec34db0e9bc2d26d2e83d41d0 with SHA-1 ab8bdc0b89 is in history

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

Change-Id: Ie9e902ce58b8c6641967c8c6a4fa74cefcf49ab1
 2020-07-10 05:00:57 +00:00
Chalard Jean
64b59634a6 Merge "Add some more public doc for MacAddress" into rvc-dev am: 2ddb47fa19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12107302

Change-Id: I2dedf3b86e1ecdb36ebfe67397de9664057fc786
 2020-07-10 05:00:54 +00:00
Chalard Jean
2ddb47fa19 Merge "Add some more public doc for MacAddress" into rvc-dev 2020-07-10 04:51:28 +00:00
Junyu Lai
b6dc1c1f92 Revert "Attribute data usage to 5G for 5G non-standalone mode" 
This reverts commit edcaa70be2.

Reason for revert: Revert and wait for the design is settled down.

Change-Id: I10fdfc37d6456678de1886698cd6ad08bf8aa810
 2020-07-10 03:43:19 +00:00
Nathan Harold
a8c853354e Migrate LTE_CA flag to NRI from DSRI 
Migrate the isUsingCarrierAggregation flag from
DataSpecificRegistrationInfo to NetworkRegistrationInfo.

This does a few things:
-Allows LTE_CA to be properly reported even in IWLAN legacy
 mode.
-Removes one additional layer of drilling up/down to store
 and retrieve the boolean flag.
-Simplifies the ratcheting logic.

Bug: 156676862
Test: atest FrameworksTelephonyTests
Change-Id: Ia7d9344e590efe0dcf2c7ba6d44d925f72d1e626
 2020-07-09 20:38:31 -07:00
Yi-yo Chiang
af73b7d2b7 Merge "ApexManager: Allow duplicating VNDK APEX package names" into rvc-dev-plus-aosp am: 397e7efce4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086438

Change-Id: I963b658bdcb54a4468ca8da3d4a33ffbd50570f4
 2020-07-10 03:22:08 +00:00
Junyu Lai
bf8e96d3ec Merge "Attribute data usage to 5G for 5G non-standalone mode" am: c987a53a93 am: b2cd1cf130 am: 09b7371d80 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359203

Change-Id: I845221848bb00355db98f0aa5a4341641e3ceec7
 2020-07-10 03:21:43 +00:00
Yi-yo Chiang
397e7efce4 Merge "ApexManager: Allow duplicating VNDK APEX package names" into rvc-dev-plus-aosp 2020-07-10 03:21:29 +00:00
Junyu Lai
09b7371d80 Merge "Attribute data usage to 5G for 5G non-standalone mode" am: c987a53a93 am: b2cd1cf130 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359203

Change-Id: I860b0226157ee31f0488d6b2252ae157e86dc5eb
 2020-07-10 03:10:15 +00:00
Junyu Lai
b2cd1cf130 Merge "Attribute data usage to 5G for 5G non-standalone mode" am: c987a53a93 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359203

Change-Id: I89ed9dd80f6b30e43e59d91fdd3fb91fb0e9be45
 2020-07-10 02:56:44 +00:00
Junyu Lai
c987a53a93 Merge "Attribute data usage to 5G for 5G non-standalone mode" 2020-07-10 02:40:46 +00:00
Sarah Chin
33e5841e87 Expose NR State string method for use in RadioInfo 
Test: build
Bug: 160825855
Change-Id: Ie709cad1c94ad204c46a559d316f45da16c3541c
 2020-07-09 19:26:03 -07:00
android-build-team Robot
82b41add4e Snap for 6668007 from a1b6280ec8 to rvc-release 
Change-Id: I1cf3cf27527270dd5c14aa70efd7a97ec1902dce
 2020-07-10 01:17:14 +00:00
chaviw
c1dcac9568 Reparent bounds layer if surface was replaced. 
In a normal case, the app will get either a visibility changed to
false or stopped from system server to indicate that the content
should be cleaned up. In those cases, it will request a relayout
to WM, which will notify VRI that the surface is gone. Since the
VRI surface is removed, the SV and bounds layer will get notified
that they should be destroyed. On the next relayout, the VRI will
get a new surface and notify SV and the bounds layer to create
new surfaces.

The scenario in the bug happens when VRI receives a visibility change to
false, but doesn't process the information fast enough. By the time it
calls relayout, WMS is in the state where the client is visible again. This
time the relayout will return a valid surface so the SV and bounds layer
will not get cleaned up. The reason this causes issues is VRI now has a
new main surface. The bounds layer is parented to the old layer that's been
deleted so it's not parented to anything. The SurfaceView is a child of
the bounds layer so it also renders offscreen.

The reparent needs to be done on the client side since WMS won't
reparent the children to the new surface if it thinks the app is
closing. WMS gets the signal that the app is stopping, but on the client
side, it doesn't get stopped since it's restarted quick enough. WMS
doesn't want to keep around old children since they will leak when the
client creates new children.

This change will reparent the bounds layer to the new VRI surface. It's
possible WMS will take care of this in certain cases where the app
isn't stopped. But for those cases, the reparent will not have
any effect since the bounds layer will be correctly parented.

Fixes: 159545768
Test: Can no longer repro black SV in maps
Test: Test app with SV and delay in onPause no longer has the same issue
Change-Id: I616652e1cc4380ebbcb386586d8d5889fcc19497
 2020-07-10 00:32:46 +00:00
Automerger Merge Worker
89fe7de25e Merge "Merge "Don't assume host is wildcard if not provided" into rvc-dev am: a1b6280ec8 am: d856d8e308" into rvc-d1-dev-plus-aosp 2020-07-09 23:56:40 +00:00
Patrick Baumann
8b9e0911d0 Merge "Don't assume host is wildcard if not provided" into rvc-dev am: a1b6280ec8 am: 8f65482603 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12118654

Change-Id: I79033b1a9f2dd43f9854ffd48910a35509be1a48
 2020-07-09 23:56:27 +00:00
Patrick Baumann
dc312f01f2 Merge "Don't assume host is wildcard if not provided" into rvc-dev am: a1b6280ec8 am: d856d8e308 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12118654

Change-Id: Ie9fde666d6f06690ec56692a62b29d7f2a9394c5
 2020-07-09 23:56:27 +00:00
Patrick Baumann
8f65482603 Merge "Don't assume host is wildcard if not provided" into rvc-dev am: a1b6280ec8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12118654

Change-Id: Id420df09eff3c591d4bab1ef7640d7ddf071b93a
 2020-07-09 23:44:38 +00:00
Patrick Baumann
d856d8e308 Merge "Don't assume host is wildcard if not provided" into rvc-dev am: a1b6280ec8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12118654

Change-Id: Id4a840f64e04228de024ee755edb0a1e51466edc
 2020-07-09 23:44:15 +00:00
Patrick Baumann
a1b6280ec8 Merge "Don't assume host is wildcard if not provided" into rvc-dev 2020-07-09 23:31:56 +00:00
Sooraj Sasindran
93847d62df [automerger skipped] Merge "Add hidden API to support allowed networks reason" am: dc52bd51d8 am: 39877c4321 -s ours am: acb884c5e9 -s ours 
am skip reason: Change-Id If4424d7d94ac26ad31725a1658dad5751d0d2629 with SHA-1 7e4cd920e7 is in history

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

Change-Id: I2ee6be00b112ffdf8b4595fc1f50805ca7365fc4
 2020-07-09 23:16:27 +00:00
Sooraj Sasindran
acb884c5e9 [automerger skipped] Merge "Add hidden API to support allowed networks reason" am: dc52bd51d8 am: 39877c4321 -s ours 
am skip reason: Change-Id If4424d7d94ac26ad31725a1658dad5751d0d2629 with SHA-1 7e4cd920e7 is in history

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

Change-Id: Id262059c5c2b155fb40c4048bfc26fb672bd8fde
 2020-07-09 23:03:42 +00:00
Sooraj Sasindran
39877c4321 Merge "Add hidden API to support allowed networks reason" am: dc52bd51d8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1358929

Change-Id: I4debe07aef416e7e1bf6c35bce879c07aaea1d68
 2020-07-09 22:52:36 +00:00
Automerger Merge Worker
fec04fd0c4 Merge "Merge "Temporarily disable checkstyle hook" into rvc-dev am: 17f8a7e553 am: 40d7c18746" into rvc-d1-dev-plus-aosp 2020-07-09 22:51:58 +00:00
TreeHugger Robot
a7a99ab46b Merge "Temporarily disable checkstyle hook" into rvc-dev am: 17f8a7e553 am: 40d7c18746 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12121346

Change-Id: Id0ebcd1f8b184fc4ae0884b843a1585e72918cea
 2020-07-09 22:51:50 +00:00
TreeHugger Robot
b9caacda84 Merge "Temporarily disable checkstyle hook" into rvc-dev am: 17f8a7e553 am: a65a36bfb5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12121346

Change-Id: Id69f5c17d9878a62f850f2abb72f2402c5f975e2
 2020-07-09 22:51:44 +00:00
TreeHugger Robot
40d7c18746 Merge "Temporarily disable checkstyle hook" into rvc-dev am: 17f8a7e553 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12121346

Change-Id: I63fbe2a69ec131247f244ea8060f05ef6edf92c9
 2020-07-09 22:42:41 +00:00
Sooraj Sasindran
dc52bd51d8 Merge "Add hidden API to support allowed networks reason" 2020-07-09 22:40:37 +00:00