Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
542,466 Commits 3 Branches 0 Tags
56936beddd997d381a4e893c437d396caabbe02e
Commit Graph

542466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wei Sheng Shih
5f91b99203 Merge "Moving all hierarchy chain to top when adjust focusable task." into rvc-dev am: 17efbc6266 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11680555

Change-Id: I3285f8b94d3ccdab2f25083dbefabe250f23a7df
 2020-06-15 09:46:20 +00:00
Lorenzo Colitti
5edf334ff9 Merge "Automatically add FEATURE_IPSEC_TUNNELS for Q+ devices." into rvc-dev am: 242087ad3e am: 77caef4748 am: 74ec0c3117 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11742658

Change-Id: Ic4110ba0b08042789f6f605d0091676a24de5b3c
 2020-06-15 09:46:16 +00:00
Hyundo Moon
8cb3412ac2 Merge "Clear preferred feature when unregistering MediaRouter2" into rvc-dev am: e7ae494759 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846909

Change-Id: Icfde0ab0b8eea47a504719396bc79d458f094ede
 2020-06-15 09:45:58 +00:00
Hyundo Moon
1fc4363546 Merge "Clear preferred feature when unregistering MediaRouter2" into rvc-dev am: e7ae494759 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846909

Change-Id: Ifed92665230b5ff5defe4a53bcd8ec768af592ab
 2020-06-15 09:45:58 +00:00
Tiger Huang
c30d4a180c Merge "Let position of system bars can be restored by swipe" into rvc-dev am: ac4e36b948 am: 5078e7a8c1 am: 2121d62ccd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11612964

Change-Id: Ibe979a2d7ad34aaca5583400616b14b1a96db5a8
 2020-06-15 09:45:50 +00:00
Tiger Huang
dcd77ed330 Merge "Let position of system bars can be restored by swipe" into rvc-dev am: ac4e36b948 am: 5078e7a8c1 am: 7f17aba6e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11612964

Change-Id: I035fc72c0a9ed60643c666d1477374780e13ce1e
 2020-06-15 09:45:49 +00:00
Wei Sheng Shih
67a056a94c Merge "Fix the root task of secondary split screen could be overwritten." into rvc-dev 2020-06-15 09:45:02 +00:00
Riddle Hsu
ee5df39e93 Merge "Finish fixed rotation of recents until transition is done" into rvc-dev 2020-06-15 09:43:53 +00:00
Louis Chang
e873ed3290 Merge "Wait for all of associated activities done animating" into rvc-dev 2020-06-15 09:43:24 +00:00
Wei Sheng Shih
17efbc6266 Merge "Moving all hierarchy chain to top when adjust focusable task." into rvc-dev 2020-06-15 09:43:05 +00:00
Hyundo Moon
e7ae494759 Merge "Clear preferred feature when unregistering MediaRouter2" into rvc-dev 2020-06-15 09:38:23 +00:00
Lorenzo Colitti
bc0df9455c Merge "Automatically add FEATURE_IPSEC_TUNNELS for Q+ devices." into rvc-dev am: 242087ad3e am: 65d9b899fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11742658

Change-Id: I620e53322569f6d68e41df58b01b762828c72592
 2020-06-15 09:34:39 +00:00
Automerger Merge Worker
4332b7d0cb Merge "Merge "Let position of system bars can be restored by swipe" into rvc-dev am: ac4e36b948 am: c298524cb0" into rvc-d1-dev-plus-aosp 2020-06-15 09:34:36 +00:00
Lorenzo Colitti
65e3c9c3c8 Merge "Automatically add FEATURE_IPSEC_TUNNELS for Q+ devices." into rvc-dev am: 242087ad3e am: 77caef4748 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11742658

Change-Id: I49c07556b26ec542dac682af18e0089c6feb013c
 2020-06-15 09:34:17 +00:00
Lorenzo Colitti
74ec0c3117 Merge "Automatically add FEATURE_IPSEC_TUNNELS for Q+ devices." into rvc-dev am: 242087ad3e am: 77caef4748 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11742658

Change-Id: Ic6fce773baa8e99197eac94b0334c77bf27d591f
 2020-06-15 09:34:17 +00:00
Tiger Huang
a713b79cf8 Merge "Let position of system bars can be restored by swipe" into rvc-dev am: ac4e36b948 am: c298524cb0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11612964

Change-Id: I4d65104adf54c50f3f0e6c9cdf8ea4794239951c
 2020-06-15 09:34:16 +00:00
Tiger Huang
7f17aba6e0 Merge "Let position of system bars can be restored by swipe" into rvc-dev am: ac4e36b948 am: 5078e7a8c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11612964

Change-Id: I276fba4092a1e50f91f554ad4bef9fd8ec5730cb
 2020-06-15 09:34:03 +00:00
Tiger Huang
2121d62ccd Merge "Let position of system bars can be restored by swipe" into rvc-dev am: ac4e36b948 am: 5078e7a8c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11612964

Change-Id: I73e23ea1a5052d4f0afb02f58fae4bf3a91825e5
 2020-06-15 09:34:02 +00:00
Lorenzo Colitti
77caef4748 Merge "Automatically add FEATURE_IPSEC_TUNNELS for Q+ devices." into rvc-dev am: 242087ad3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11742658

Change-Id: Idd382f36a1d95246af1daf8cd6e4321277ac99de
 2020-06-15 09:18:21 +00:00
Lorenzo Colitti
65d9b899fd Merge "Automatically add FEATURE_IPSEC_TUNNELS for Q+ devices." into rvc-dev am: 242087ad3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11742658

Change-Id: I8f8b48bcdaaaef63efbc264cb479ee9a4d4ec134
 2020-06-15 09:18:01 +00:00
Tiger Huang
5078e7a8c1 Merge "Let position of system bars can be restored by swipe" into rvc-dev am: ac4e36b948 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11612964

Change-Id: Ied8d90df0584ffd071b4e9ac3b3ec42f0adb4203
 2020-06-15 09:17:46 +00:00
Tiger Huang
c298524cb0 Merge "Let position of system bars can be restored by swipe" into rvc-dev am: ac4e36b948 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11612964

Change-Id: Ie1912992be2ab8a3046b713b825753e1d63ca63b
 2020-06-15 09:17:33 +00:00
Benedict Wong
531aa19991 Automatically add FEATURE_IPSEC_TUNNELS for Q+ devices. 
This change automatically enables the IPSEC_TUNNELS mandatory feature
for devices launching with or above Q.

This is for OEM convenience to ensure that they do not have to add the
feature for each device that they ship.

Bug: 156711979
Test: Removed feature from device, CTS tested
Change-Id: I9d1a0e9616cdc7089a9bef7c96ff3780de36ed8d
Merged-In: I9d1a0e9616cdc7089a9bef7c96ff3780de36ed8d
 2020-06-15 09:07:06 +00:00
Lorenzo Colitti
242087ad3e Merge "Automatically add FEATURE_IPSEC_TUNNELS for Q+ devices." into rvc-dev 2020-06-15 09:06:29 +00:00
Tiger Huang
ac4e36b948 Merge "Let position of system bars can be restored by swipe" into rvc-dev 2020-06-15 08:54:46 +00:00
TreeHugger Robot
c5321dab68 Merge "Revert "Only add divider when it need to show"" into rvc-dev am: c944f5e947 am: 6f66eb5707 am: 6bef2ac053 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11863638

Change-Id: I4b3139481fa8741602d5416e11d77ca676ba8c14
 2020-06-15 08:45:06 +00:00
TreeHugger Robot
2f91a14ccf Merge "Revert "Only add divider when it need to show"" into rvc-dev am: c944f5e947 am: 6f66eb5707 am: 81ac9d036f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11863638

Change-Id: I80bb35f0b4a4da105900efcbac9e778c696596e6
 2020-06-15 08:42:35 +00:00
TreeHugger Robot
ed6e7feedc Merge "Revert "Only add divider when it need to show"" into rvc-dev am: c944f5e947 am: 5b5dcbdc55 am: 92f81308fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11863638

Change-Id: I2804db77757e5c85780838805ee23e3f571c3477
 2020-06-15 08:42:21 +00:00
TreeHugger Robot
81ac9d036f Merge "Revert "Only add divider when it need to show"" into rvc-dev am: c944f5e947 am: 6f66eb5707 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11863638

Change-Id: I47863018b82969ed356aea667469adfc2e3ada41
 2020-06-15 08:31:00 +00:00
TreeHugger Robot
6bef2ac053 Merge "Revert "Only add divider when it need to show"" into rvc-dev am: c944f5e947 am: 6f66eb5707 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11863638

Change-Id: Ie886abe1738903e3e6dea86154b6d62df0e98ea1
 2020-06-15 08:30:44 +00:00
TreeHugger Robot
92f81308fd Merge "Revert "Only add divider when it need to show"" into rvc-dev am: c944f5e947 am: 5b5dcbdc55 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11863638

Change-Id: I42a82bedde9eedbfd160892a042bc49f98d3de2b
 2020-06-15 08:26:15 +00:00
Jin Seok Park
4bf177f046 [Media ML] Support customization for volume keys 
Create KeyEventHandler class that is extended separately for media
and volume KeyEvents. The logic for long press and
single/double/triple taps will be the same for both KeyEvent types.

Bug: 157988289
Test: manually
Change-Id: I0df16c99d0f07714845c3324d24a804c2923ad28
(cherry picked from commit 4d7d6d8354)
 2020-06-15 08:22:15 +00:00
TreeHugger Robot
5b5dcbdc55 Merge "Revert "Only add divider when it need to show"" into rvc-dev am: c944f5e947 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11863638

Change-Id: I04376d85cd910a9171cf4fca216bdd8f5e8faeb4
 2020-06-15 08:14:03 +00:00
TreeHugger Robot
6f66eb5707 Merge "Revert "Only add divider when it need to show"" into rvc-dev am: c944f5e947 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11863638

Change-Id: Ia79d872a4cec311280b17e8c03ad983b70de885a
 2020-06-15 08:14:01 +00:00
Remi NGUYEN VAN
7e24fd9a0b Use unstable networkstack AIDLs in development branches 
Development branches should use the -unstable version of the
NetworkStack AIDLs so that refreezing is not necessary for each
modification.
The versions will be re-frozen before each release instead.

Bug: 157534516
Change-Id: I74b4a16266bda7b8ac740b3a0193268da260fc2f
Test: m
 2020-06-15 08:05:49 +00:00
Hugh Chen
c06745b3d3 Fix advanced icon will incorrect on some device 
Use the fixed value to locate the center of icon instead
of use value of density. Because the value of density will
different between the device according the resolution.

Bug: 156689249
Test: build pass
Change-Id: I6d3a53e68058232871dd281ec4736179090a6580
 2020-06-15 16:04:38 +08:00
TreeHugger Robot
c944f5e947 Merge "Revert "Only add divider when it need to show"" into rvc-dev 2020-06-15 07:59:00 +00:00
shawnlin
2806269a5a Fixed the conflict of the release methods of ActivityView & TaskEmbedder 
There is a case in Bubble that we might release a un-initialized
TaskEmbedder while calling ActivityView.release() (ex. create a bubble
and don't expand it and then dismiss it) which will cause an exception.

Allow ActivityView.release() to be called at anytime and check the
initialization state before calling TaskEmbedder.release().

Bug: 155417004
Test: 1. Add bubbles and don't expands them then dimiss them
      2. Check logs.
Change-Id: I583ddd36f407c908cb63c109834940fc91c8d130
 2020-06-15 15:47:14 +08:00
Automerger Merge Worker
24b52c9aa8 Merge "Merge "Don't lock rotation to natural rotation when entering overview" into rvc-dev am: ec09667201 am: 4d8763d941 am: 078d18ddb0" into rvc-qpr-dev-plus-aosp 2020-06-15 07:39:28 +00:00
Automerger Merge Worker
591a87ca4b Merge "Merge "Don't lock rotation to natural rotation when entering overview" into rvc-dev am: ec09667201 am: 3bed25d0fa" into rvc-d1-dev-plus-aosp am: a07eda0888 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833794

Change-Id: If934e775a7b285ace667c93fcbc646106f9f3eb4
 2020-06-15 07:39:06 +00:00
TreeHugger Robot
393871a5e8 Merge "Don't lock rotation to natural rotation when entering overview" into rvc-dev am: ec09667201 am: 4d8763d941 am: 078d18ddb0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833794

Change-Id: I9fc182fde4a695bcc7e525d51b79072087ac5635
 2020-06-15 07:39:05 +00:00
TreeHugger Robot
bde420b4df Merge "Don't lock rotation to natural rotation when entering overview" into rvc-dev am: ec09667201 am: 4d8763d941 am: 36be3fea96 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833794

Change-Id: I255bdf460fa4eb6a0cd555042090cd61d4a29e65
 2020-06-15 07:38:49 +00:00
Automerger Merge Worker
a07eda0888 Merge "Merge "Don't lock rotation to natural rotation when entering overview" into rvc-dev am: ec09667201 am: 3bed25d0fa" into rvc-d1-dev-plus-aosp 2020-06-15 07:26:39 +00:00
TreeHugger Robot
20f26c7ca1 Merge "Don't lock rotation to natural rotation when entering overview" into rvc-dev am: ec09667201 am: 3bed25d0fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833794

Change-Id: I609de10d88273aab269667c6e1ddfaeb0dc24abe
 2020-06-15 07:26:34 +00:00
TreeHugger Robot
36be3fea96 Merge "Don't lock rotation to natural rotation when entering overview" into rvc-dev am: ec09667201 am: 4d8763d941 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833794

Change-Id: I839aa54c6d53df0a9860d8888a4ed0ea1291ebd5
 2020-06-15 07:26:26 +00:00
TreeHugger Robot
078d18ddb0 Merge "Don't lock rotation to natural rotation when entering overview" into rvc-dev am: ec09667201 am: 4d8763d941 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833794

Change-Id: Ie314dbb6c580ff3124fe5b312c801a1f90013203
 2020-06-15 07:26:22 +00:00
TreeHugger Robot
3bed25d0fa Merge "Don't lock rotation to natural rotation when entering overview" into rvc-dev am: ec09667201 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833794

Change-Id: Idd7a8d4bfa248e1dde5798b51431d3eaf5462e44
 2020-06-15 07:17:07 +00:00
TreeHugger Robot
4d8763d941 Merge "Don't lock rotation to natural rotation when entering overview" into rvc-dev am: ec09667201 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833794

Change-Id: I6238ceba32b3943d0ed1d4eb89f13716b5c4ae24
 2020-06-15 07:17:05 +00:00
TreeHugger Robot
ec09667201 Merge "Don't lock rotation to natural rotation when entering overview" into rvc-dev 2020-06-15 07:05:25 +00:00
Aaron Huang
92b5c72c5b Add unit test for NetworkStatsSubscriptionsMonitor 
Bug: 154080205
Test: atest FrameworksNetTests:com.android.server.net.NetworkStatsSubscriptionsMonitorTest
(copy from ag/11788484 but getActiveAndHiddenSubscriptionIdList() since it's renamed
in internal)
Change-Id: Ia162f36efe96d90b2f6f70190d9fa855bba34484
Merged-In: I4ef3f1ab2e5ea1322133edd80db3ccd0022e9c91
 2020-06-15 07:05:19 +00:00