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
TreeHugger Robot
3d61c82b41 Merge "[DO NOT MERGE]Revert "Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #6."" into rvc-dev 2020-07-02 15:29:17 +00:00
Sahana Rao
a2127eb446 [DO NOT MERGE]Revert "Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #6." 
This reverts commit 5dad7cd45e.

Reason for revert: b/159995598
Bug: 159995598, 115619667
Change-Id: I6df037161dc36da7f8b33292529bbc37058f819c
 2020-07-02 15:28:46 +00:00
markchien
959722f93a Skip testPhysicalEthernet if the test run adb over network 
If the test run adb over network and ethernet is available, it is likely
that adb may run over ethernet. Then the test would fail because adb
would break when ethernet is switching from client mode to server mode.

Bug: 160389275
Test: atest CtsTetheringTest

Change-Id: I57d365d33316881c50c3bf7fd1c98926d10842d3
 2020-07-02 23:26:46 +08:00
Automerger Merge Worker
f7d6b97b4a Merge "Merge "Revert new logic around FLAG_ALT_FOCUSABLE_IM" into rvc-dev am: 0ef33bcb35 am: 315a1e45b2" into rvc-d1-dev-plus-aosp 2020-07-02 13:52:47 +00:00
TreeHugger Robot
299ade5217 Merge "Revert new logic around FLAG_ALT_FOCUSABLE_IM" into rvc-dev am: 0ef33bcb35 am: 315a1e45b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12059199

Change-Id: Ibec0d39a1106084088df100937c5b2601cea2409
 2020-07-02 13:52:36 +00:00
TreeHugger Robot
3c23d4a4ed Merge "Revert new logic around FLAG_ALT_FOCUSABLE_IM" into rvc-dev am: 0ef33bcb35 am: 6b2c843091 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12059199

Change-Id: I2d1f32af00c1238690a2928eef1867bb6c6de2e6
 2020-07-02 13:52:24 +00:00
TreeHugger Robot
6b2c843091 Merge "Revert new logic around FLAG_ALT_FOCUSABLE_IM" into rvc-dev am: 0ef33bcb35 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12059199

Change-Id: I84000632fef10ddf0ec14e82fbcc55eb5e47845e
 2020-07-02 13:42:01 +00:00
TreeHugger Robot
315a1e45b2 Merge "Revert new logic around FLAG_ALT_FOCUSABLE_IM" into rvc-dev am: 0ef33bcb35 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12059199

Change-Id: Ic1c9e072a19f2ddd4c33fb3a82eed813a6010401
 2020-07-02 13:41:43 +00:00
TreeHugger Robot
0ef33bcb35 Merge "Revert new logic around FLAG_ALT_FOCUSABLE_IM" into rvc-dev 2020-07-02 13:28:33 +00:00
Orion Hodson
3eba1ab83a Use jni_headers instead of JNI_H_INCLUDE 
Bug: 152482542
Test: m librs_jni DynamicCodeLoggerNativeTestLibrary
Exempt-From-Owner-Approval: build refactoring
Change-Id: I3069c513f333afc202505081992c59e80b536ed6
 2020-07-02 13:50:33 +01:00
Tiger Huang
3182bfe478 Merge "Apply the requested insets sources if possible" into rvc-dev am: 5d717b85a1 am: 4640bfb14b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12055450

Change-Id: I7ba3da9cc1f89d2023882c42c2638baf338f0537
 2020-07-02 11:45:32 +00:00
Tiger Huang
0e6077e98e Merge "Apply the requested insets sources if possible" into rvc-dev am: 5d717b85a1 am: b31b0fbda0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12055450

Change-Id: Icf204eadaf07bff75ad8c7e75192c55b4bac0307
 2020-07-02 11:33:05 +00:00
Tiger Huang
4640bfb14b Merge "Apply the requested insets sources if possible" into rvc-dev am: 5d717b85a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12055450

Change-Id: Iab526e2c30ec0dea3872f18a7123615d0d0e9c62
 2020-07-02 11:21:47 +00:00
Tiger Huang
b31b0fbda0 Merge "Apply the requested insets sources if possible" into rvc-dev am: 5d717b85a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12055450

Change-Id: Iaf5687173764abf5b315c7f2a5be495f073e4aad
 2020-07-02 11:21:31 +00:00
Tiger Huang
5d717b85a1 Merge "Apply the requested insets sources if possible" into rvc-dev 2020-07-02 11:12:12 +00:00
Nicolas Geoffray
2f5a81e8c1 Merge "Remove unused / unimplemented CorePlatformAPI methods." am: ebe415b310 am: 4d150059e3 am: a97d2afc1e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1352354

Change-Id: I75abe2c43d8eab583681fcae700cd9b183a49fac
 2020-07-02 11:04:12 +00:00
vichang
542d231ddd Merge "Move libcore.timezone to the i18n module - Final part" am: 35d6ab6a89 am: 1c44c3b771 am: 4d9269062b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348602

Change-Id: I5ddccd8769e07dd201d4902c2e4a519c57204bad
 2020-07-02 11:03:47 +00:00
Nicolas Geoffray
a97d2afc1e Merge "Remove unused / unimplemented CorePlatformAPI methods." am: ebe415b310 am: 4d150059e3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1352354

Change-Id: Ife8fad22006a2817d04e9f7238dcd84b198c8869
 2020-07-02 10:50:28 +00:00
vichang
4d9269062b Merge "Move libcore.timezone to the i18n module - Final part" am: 35d6ab6a89 am: 1c44c3b771 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348602

Change-Id: I89413242c6497114e8e533cff43d17b44fd758eb
 2020-07-02 10:50:07 +00:00
Nicolas Geoffray
4d150059e3 Merge "Remove unused / unimplemented CorePlatformAPI methods." am: ebe415b310 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1352354

Change-Id: Ib0da8556674b3c388d62596559d14773fd277fdd
 2020-07-02 10:49:57 +00:00
Nicolas Geoffray
ebe415b310 Merge "Remove unused / unimplemented CorePlatformAPI methods." 2020-07-02 10:44:44 +00:00
vichang
1c44c3b771 Merge "Move libcore.timezone to the i18n module - Final part" am: 35d6ab6a89 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348602

Change-Id: Idd7e83754b7a414c6e647ae8e9cd95795c92c1b8
 2020-07-02 10:38:54 +00:00
vichang
35d6ab6a89 Merge "Move libcore.timezone to the i18n module - Final part" 2020-07-02 10:25:54 +00:00
Automerger Merge Worker
992fdbd210 Merge "Merge "Always kill app when M_E_S is denied" into rvc-dev am: d7e1e4681e am: e2829e983c" into rvc-d1-dev-plus-aosp 2020-07-02 10:16:21 +00:00
Shafik Nassar
80d87c3eac Merge "Always kill app when M_E_S is denied" into rvc-dev am: d7e1e4681e am: 7b81c455fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12048548

Change-Id: Ie54e79c39d39ca1654910e31d7f51b450d37c764
 2020-07-02 10:16:15 +00:00
Shafik Nassar
699cf11648 Merge "Always kill app when M_E_S is denied" into rvc-dev am: d7e1e4681e am: e2829e983c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12048548

Change-Id: I7fbf8b0f3e06cdb4f335931876f93bef43811796
 2020-07-02 10:16:09 +00:00
Shafik Nassar
7b81c455fd Merge "Always kill app when M_E_S is denied" into rvc-dev am: d7e1e4681e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12048548

Change-Id: I79df65b30c6be23e6e6eaa1af1859ac33863e388
 2020-07-02 10:03:35 +00:00
Shafik Nassar
e2829e983c Merge "Always kill app when M_E_S is denied" into rvc-dev am: d7e1e4681e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12048548

Change-Id: I825adf2261904a8458d5cccc2722bf6110ae740f
 2020-07-02 10:03:34 +00:00
Remi NGUYEN VAN
240612eee4 [automerger skipped] Merge "Move Inet[4]AddressUtils to libs/net" am: 5bc91ca167 am: b903009741 -s ours am: 3fc2f61e2d -s ours 
am skip reason: Change-Id I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f with SHA-1 eee629f4c7 is in history

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

Change-Id: Iad6a186fda02f69741ef0a2403e16973300bae1e
 2020-07-02 09:52:45 +00:00
Shafik Nassar
d7e1e4681e Merge "Always kill app when M_E_S is denied" into rvc-dev 2020-07-02 09:49:06 +00:00
Remi NGUYEN VAN
3fc2f61e2d [automerger skipped] Merge "Move Inet[4]AddressUtils to libs/net" am: 5bc91ca167 am: b903009741 -s ours 
am skip reason: Change-Id I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f with SHA-1 eee629f4c7 is in history

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

Change-Id: Iae9c8eb2e17130737e4cd30b03c4d20afbae6dc8
 2020-07-02 09:39:11 +00:00
Remi NGUYEN VAN
b903009741 Merge "Move Inet[4]AddressUtils to libs/net" am: 5bc91ca167 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1324109

Change-Id: I51d32e4efd0d9fc458b02022b6308920f7c812a9
 2020-07-02 09:21:23 +00:00
Adrian Roos
69947c0671 Revert new logic around FLAG_ALT_FOCUSABLE_IM 
This broke several apps because it means certain NON_FOCUSABLE windows
are now layered wrong w.r.t the IME, and also no longer get IME insets.

Originally, this was introduced because the IME target was used to
compute which window gets control, but this is now computed based on
the window actually connecting to the IME as reported per IMMS.

Reverts I941571c97145d77b0a59d030cf2a8c8318f3b59f.

Bug: 143898978
Bug: 140641950
Bug: 145812508
Bug: 141738570
Bug: 144619551
Fixes: 159438771
Test: atest WindowStateTests
      atest FocusHandlingTest
      atest WindowManager_LayoutParamsTest
      Also manually using steps:
      1. Launch gmail compose activity
      2. start typing in receipient field
      3. verify that even thoug the suggestions popup
         window w/ FLAG_NOT_FOCUSABLE becomes the
         IME target, control and insets still work.
Change-Id: If451276b1a8c485ec88965d8d30ec8fd3836620f
 2020-07-02 11:14:10 +02:00
Remi NGUYEN VAN
5bc91ca167 Merge "Move Inet[4]AddressUtils to libs/net" 2020-07-02 09:11:52 +00:00
Nicolas Geoffray
c96e8b2184 Merge "Remove references to Dalvik logger." am: 385a775e73 am: 40ab1cf73c am: 75f6223c7c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1352358

Change-Id: Ic091f8b0ad9a162ccc8e72566026bee1aace9bdb
 2020-07-02 09:05:09 +00:00
Nicolas Geoffray
75f6223c7c Merge "Remove references to Dalvik logger." am: 385a775e73 am: 40ab1cf73c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1352358

Change-Id: Ib9cdd470cc9cb0f199dc97b1d05e1d833dd3808c
 2020-07-02 08:52:23 +00:00
Nicolas Geoffray
40ab1cf73c Merge "Remove references to Dalvik logger." am: 385a775e73 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1352358

Change-Id: Ibddd352acc1b92f293e64359f833c89ed2e44957
 2020-07-02 08:35:37 +00:00
Nicolas Geoffray
385a775e73 Merge "Remove references to Dalvik logger." 2020-07-02 08:23:15 +00:00
Taesu Lee
3e3baa0b9d Ignore invalid time stamp in SMS PDUs 
Catch a DateTimeException so that we don't lose SMS PDUs even if they
have invalid time stamp caused by SMSC problems.

Bug: 160200121
Test: Received SMS having invalid time stamp

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Change-Id: I80ef1c134f49d6a23e87a77125f54f4f66d62023
 2020-07-02 16:50:08 +09:00
Tim Peng
626e4c54a2 Unable to show correct device icon in Output Switcher 
-Media framework does not report "TYPE_GROUP" when selecting a group
of Chromecast devices or the StaticGroup
-MediaRouter2Info::getType() does not provide correct types for group
and video
-Add "getDrawableResIdByFeature()" to get correct type icon
-Use MediaRouter2Info::getFeatures() to get device type
-Designer updates the video icon

Bug: 160113560
Test: make -j50 RunSettingsLibRoboTests
Change-Id: I1c8e9c2729013b9ee49b664e40c04550f315a516
 2020-07-02 06:45:38 +00:00
Automerger Merge Worker
57cb7595fa Merge "Merge "Exclude MediaSession2 from the media button session" into rvc-dev am: 31fdc74154 am: a5b0451eb6" into rvc-d1-dev-plus-aosp 2020-07-02 06:43:01 +00:00
TreeHugger Robot
402f0a4a99 Merge "Exclude MediaSession2 from the media button session" into rvc-dev am: 31fdc74154 am: a5b0451eb6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12042284

Change-Id: I36d57341b964485b4067f86a002657b6606e6031
 2020-07-02 06:42:50 +00:00
TreeHugger Robot
c68f14df9e Merge "Exclude MediaSession2 from the media button session" into rvc-dev am: 31fdc74154 am: 458d37d5bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12042284

Change-Id: Ifa886ed5b7941933b0c3f476f6a7b276bc0605f5
 2020-07-02 06:42:35 +00:00
TreeHugger Robot
458d37d5bb Merge "Exclude MediaSession2 from the media button session" into rvc-dev am: 31fdc74154 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12042284

Change-Id: Ia533e6b9f0f1ad379d3e4febe542bb627b5fd875
 2020-07-02 06:30:33 +00:00
TreeHugger Robot
a5b0451eb6 Merge "Exclude MediaSession2 from the media button session" into rvc-dev am: 31fdc74154 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12042284

Change-Id: I8e8f8c6518c45130203df5aee8212041074f5c0b
 2020-07-02 06:30:21 +00:00
wilsonshih
3c1c2c04e2 Fix the regression that closing transition disappeared. 
For hierarchical animation, there are missing some handling
around mNeedsZBoost, when closing an activity the transition did
not applied.

1. Move some codes around mNeedsZBoost from ActivityRecord to
WindowContainer so Task can also benefit from it.
2. TaskDisplayArea#assignChildLayers should combined needsZBoost
so this attribute can apply on root task.
3. If next top activity will move to top in #finishIfPossible
and the finishing activity is on top, provide it a higher layer
to remain on top. Otherwise user will see flicker because the
transition need to be applied until next activity resumed.

Bug: 159200318
Test: atest ActivityRecordTests TaskDisplayAreaTests
AppWindowTokenAnimationTests TransitionSelectionTests

Change-Id: I85ec3307b31444e09179abca30298af2ce538834
 2020-07-02 14:29:40 +08:00
TreeHugger Robot
31fdc74154 Merge "Exclude MediaSession2 from the media button session" into rvc-dev 2020-07-02 06:10:10 +00:00
wilsonshih
48445a9154 Remove redundant checks that stop updating systemUI when entering dream 
Previous in order to get better transition from lock screen to Dream, we skip the updateSystemUiVisibility by checking keyguard and occluded
states. But since the Dream become activity, there will be an opening app transition for DreamActivity, the original check condition should be able to removed now.
Ref: 4c1e3183ba
Ref: 380ecb81db

Bug: 159790735
Test: atest DisplayPolicyTests
Change-Id: I057e9b2f866c1deaaf41f50f75edc00f6849ea86
 2020-07-02 04:48:58 +00:00
TreeHugger Robot
123dfcfc2e Merge "Fix flaky media key event related CTS tests" into rvc-dev am: 7feac4ed47 am: 2aa907fbab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12004926

Change-Id: I2c9588cea7642dddaaa27318f8aa03c94bfaa229
 2020-07-02 02:29:28 +00:00
TreeHugger Robot
f032d382ee Merge "Fix flaky media key event related CTS tests" into rvc-dev am: 7feac4ed47 am: 1d658df5e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12004926

Change-Id: I09a6af004ae1a80ad35a6dddfa6bd4677d539da4
 2020-07-02 02:29:11 +00:00