Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
622,527 Commits 3 Branches 0 Tags
21c038eeed79c035ed85fee8bea31aedecfbc2bf
Commit Graph

622527 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
21c038eeed Merge "Improve getConnectionOwnerUid tests." am: 3695e752ff am: a7a6b5187a am: bf15176edf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572980

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie69cc409c24468aaebb4a0267009bdc4f9b7a622
 2021-02-04 10:11:21 +00:00
TreeHugger Robot
000b267dc9 Merge "No need to 'addChild' when start 'FLAG_ACTIVITY_CLEAR_TOP' Activity." into sc-dev 2021-02-04 09:50:24 +00:00
Lorenzo Colitti
bf15176edf Merge "Improve getConnectionOwnerUid tests." am: 3695e752ff am: a7a6b5187a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572980

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I82e9db5a466e6a40eaa92dfe45ed29447641d8e5
 2021-02-04 09:48:08 +00:00
Lorenzo Colitti
a7a6b5187a Merge "Improve getConnectionOwnerUid tests." am: 3695e752ff 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572980

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I28b29f3acbc253e80bfe756ed67e48e4ce81af90
 2021-02-04 09:09:50 +00:00
TreeHugger Robot
f1aaec7b4b Merge "API: Suppress existing NullableCollections lints (S edition, die zweite)" into sc-dev 2021-02-04 09:04:23 +00:00
Adam Bookatz
6344e2dbe8 Merge "MeasuredEnergyStats supports custom energy buckets" into sc-dev 2021-02-04 08:38:15 +00:00
Galia Peycheva
bf21f495df Merge "Make window blur behind public API" into sc-dev 2021-02-04 08:31:45 +00:00
Lorenzo Colitti
3695e752ff Merge "Improve getConnectionOwnerUid tests." 2021-02-04 08:22:03 +00:00
Lucas Lin
b9cf7d051f Merge "Reimplement [read|write]ArraySet of Parcel inside NetworkCapabilities" am: be75db951a am: a1eb910ead am: 6e81f01538 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556547

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ad30835e454c5003b36d0a87e0c34c88b2438bf
 2021-02-04 08:18:40 +00:00
TreeHugger Robot
ccd3363b26 [automerger skipped] Merge changes I6ec246a6,If7eb8857,Id3d12b23,Ia52f9caf,I21028457, ... into rvc-qpr-dev am: 82c672dff6 -s ours am: 77ba287065 -s ours 
am skip reason: Change-Id I6ec246a6a4e61f634956a165797fbb80296efd6a with SHA-1 75dec29090 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4300049cb11249c703f6f5c8fbcda5a14c569b5f
 2021-02-04 08:17:39 +00:00
yangyankai1
06b4c41766 No need to 'addChild' when start 'FLAG_ACTIVITY_CLEAR_TOP' Activity. 
Android R refactor Activity launchMode:'FLAG_ACTIVITY_CLEAR_TOP',
'singleTop','singleInstance'. After Android R restructure, the
'addChild' method leads to Activity leaks. No need to 'addChild'
in the current Android version anymore.

Test: build pass, feature pass.
TestCase: Start a Activity twice with flag 'FLAG_ACTIVITY_CLEAR_TOP'.
Reproductivity: always.

Bug: 178734693
Signed-off-by: yangyankai1 <yangyankai1@xiaomi.com>
Change-Id: Ia4d5b875a6592b6448af7500626b5a273bd96dc3
Merged-In: Ia4d5b875a6592b6448af7500626b5a273bd96dc3
 2021-02-04 07:48:54 +00:00
Lucas Lin
6e81f01538 Merge "Reimplement [read|write]ArraySet of Parcel inside NetworkCapabilities" am: be75db951a am: a1eb910ead 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556547

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9f337c1439d757dea60e91c8b182c3eb77633030
 2021-02-04 07:46:57 +00:00
TreeHugger Robot
77ba287065 [automerger skipped] Merge changes I6ec246a6,If7eb8857,Id3d12b23,Ia52f9caf,I21028457, ... into rvc-qpr-dev am: 82c672dff6 -s ours 
am skip reason: Change-Id I6ec246a6a4e61f634956a165797fbb80296efd6a with SHA-1 75dec29090 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I053b05625069920a308a0ec96cf34641644beffe
 2021-02-04 07:45:47 +00:00
TreeHugger Robot
82c672dff6 Merge changes I6ec246a6,If7eb8857,Id3d12b23,Ia52f9caf,I21028457, ... into rvc-qpr-dev 
* changes:
  Fix legacy APIs when VPN switches to suspended underlying network.
  Backport test coverage from aosp/1547496.
  Backport some helpers in ConnectivityServiceTest.
  Test for bugs with suspended VPN underlying networks.
  Add a test for getDefaultNetworkCapabilitiesForUser.
  Improve testing of CONNECTIVITY_ACTION broadcasts.
  Test passing an underlying network array with null network in it.
  Make testVpnNetworkActive more deterministic.
  Make MockVpn more realistic and easier to use.
  Increase test coverage for VPN info sent to NetworkStatsService.
  Simplify MockVpn.
  Test a VPN with an underlying network that does not yet exist.
 2021-02-04 07:01:55 +00:00
Lucas Lin
a1eb910ead Merge "Reimplement [read|write]ArraySet of Parcel inside NetworkCapabilities" am: be75db951a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556547

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a6774b8a1a029dbe34fe7aa8a4af3d94bdc0bb4
 2021-02-04 06:52:05 +00:00
Wei Sheng Shih
219eeebcf6 Merge "Workaround for wallpapers render thread been paused while visible." into sc-dev 2021-02-04 06:50:49 +00:00
Lucas Lin
be75db951a Merge "Reimplement [read|write]ArraySet of Parcel inside NetworkCapabilities" 2021-02-04 06:12:14 +00:00
Tiger Huang
cf1138d479 Merge "Remove outFrame from the parameters of addWindow" into sc-dev 2021-02-04 05:46:17 +00:00
Robert Chou
7bd66f29fb Merge "Fix data limit notification issue" am: 478bbc1f3f am: 6ae10abbad am: d00e50549b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532900

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5facec5a06f44bd48fa74efb85dd2a8e565e3426
 2021-02-04 05:23:52 +00:00
Benedict Wong
5a1029f51a Merge "Implement ConnectedState" am: 9a59faa385 am: 7d8f1cd5ae am: ba464802b7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550525

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib341f1ac4286262fcc547cc36428777f407b90a6
 2021-02-04 05:23:35 +00:00
Treehugger Robot
6c8fc6b15f Merge "Add BatteryStats OWNERS to native code" am: 9ecf49ba26 am: 456a473867 am: 6b337f54a4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573882

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifbe783518f93160b4c93893a4ea8e37e6899b089
 2021-02-04 05:23:19 +00:00
Robert Chou
d00e50549b Merge "Fix data limit notification issue" am: 478bbc1f3f am: 6ae10abbad 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532900

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c114c0f70e48d5a14b38a680f604aa49f89dd74
 2021-02-04 05:23:17 +00:00
Benedict Wong
ba464802b7 Merge "Implement ConnectedState" am: 9a59faa385 am: 7d8f1cd5ae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550525

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3fee1221533d76cd73e0c136b3658059892502f0
 2021-02-04 05:23:03 +00:00
Treehugger Robot
c4a0579e2a Merge "Add/remove user state based off user unlocking" am: 85797196b4 am: 6b55ff4456 am: 7fe1787bcf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566902

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie89a795b243ae8b09d805274ae8affe8899e6b2b
 2021-02-04 05:22:56 +00:00
Robert Chou
6ae10abbad Merge "Fix data limit notification issue" am: 478bbc1f3f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532900

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ac765a6e3789e6bf8bd523172a61bcfc0aa2d5d
 2021-02-04 05:14:17 +00:00
Robert Chou
478bbc1f3f Merge "Fix data limit notification issue" 2021-02-04 05:03:38 +00:00
Benedict Wong
7d8f1cd5ae Merge "Implement ConnectedState" am: 9a59faa385 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550525

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2caa0041eaee3eb5f7c27720484c1413318364e7
 2021-02-04 04:51:28 +00:00
Treehugger Robot
6b337f54a4 Merge "Add BatteryStats OWNERS to native code" am: 9ecf49ba26 am: 456a473867 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573882

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I881adb3dc99e9917afe1195cf4a17b06052f9e62
 2021-02-04 04:32:38 +00:00
Treehugger Robot
7fe1787bcf Merge "Add/remove user state based off user unlocking" am: 85797196b4 am: 6b55ff4456 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566902

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I962b632c5ca389109cb8381af4812529bc24797a
 2021-02-04 04:32:12 +00:00
Lorenzo Colitti
b7e9f5b1ca Improve getConnectionOwnerUid tests. 
Currently, the tests only check whether the method throws a
SecurityException or not. Also check the return value of the
call, by mocking out InetDiagMessage.getConnectionOwnerUid.

This is required to test an upcoming change that will never
throw SecurityException but always return INVALID_UID if the
caller lacks permissions.

Bug: 173331190
Test: test-only change
Change-Id: I63f42a2f098fcf8796c9b4525a3a7b8320c0a139
 2021-02-04 04:19:28 +00:00
Riddle Hsu
cf6cd1ba41 Merge "Print exception log of activity task related transaction" into sc-dev 2021-02-04 04:18:27 +00:00
TreeHugger Robot
670ffead57 Merge "Change QS drag handle color" into sc-dev 2021-02-04 03:58:45 +00:00
Treehugger Robot
456a473867 Merge "Add BatteryStats OWNERS to native code" am: 9ecf49ba26 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573882

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0fe9e49ce090c8558fc80218b65c51ef752ceb1c
 2021-02-04 03:46:14 +00:00
Treehugger Robot
6b55ff4456 Merge "Add/remove user state based off user unlocking" am: 85797196b4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566902

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief182a280a252187abd50fc68ff11f3bdcc978e2
 2021-02-04 03:36:14 +00:00
wilsonshih
ed0a167067 Workaround for wallpapers render thread been paused while visible. 
Workaround for some wallpapers cannot trigger the rendering threads of
the remaining engines even if they are visible, so we need to toggle
the state to get their attention.

Bug: 168759123
Test: atest WallpaperManagerTest WallpaperServiceTest
WallpaperServiceTests

Change-Id: I4c047f6e932b280e6408f44e590e39b1a9b62128
 2021-02-04 03:25:46 +00:00
Hui Yu
2122345cc6 Merge "Elaborate on ProcessRecord's BG-FGS-launch ability." into sc-dev 2021-02-04 03:14:25 +00:00
Benedict Wong
9a59faa385 Merge "Implement ConnectedState" 2021-02-04 02:58:09 +00:00
Treehugger Robot
9ecf49ba26 Merge "Add BatteryStats OWNERS to native code" 2021-02-04 02:52:04 +00:00
Remi NGUYEN VAN
5ab2994cf5 Merge "Use formal API for ActivityThread to set proxy" into sc-dev 2021-02-04 02:44:38 +00:00
Adam Bookatz
a35c5e1c88 Merge "Log when removeUser called again" into sc-dev 2021-02-04 02:32:40 +00:00
Adam Bookatz
696dd2af2d MeasuredEnergyStats supports custom energy buckets 
MeasuredEnergyStats now supports a variable number of
'buckets', including both the standard buckets (fixed number)
and additional custom buckets (variable number) whose meaning
is unknown to BatteryStats (but is enumerated as an 'ordinal').
This will be used to store per-uid energy data from custom
power components.

Test: atest MeasuredEnergyStatsTest
Test: atest com.android.internal.os.BatteryStatsTests
Bug: 179107328
Bug: 174186358
Change-Id: I0022ac6940daca5f1e7d0e502eed01effa71f796
 2021-02-04 02:26:31 +00:00
Amy Zhang
852ca25a9a Merge "Connect Frontend Settings between TunerFrontend and FrontendClient" into sc-dev 2021-02-04 02:23:32 +00:00
Treehugger Robot
85797196b4 Merge "Add/remove user state based off user unlocking" 2021-02-04 02:05:28 +00:00
Darryl Johnson
951b54e2e0 Merge "Allow multiple device states to be treated as folded." into sc-dev 2021-02-04 01:45:29 +00:00
Darryl Johnson
dfe7df31c9 Merge "Allow DeviceStateProvider to provide optional String name for device states." into sc-dev 2021-02-04 01:44:13 +00:00
Louis Chang
63de548c94 Merge "No need to 'addChild' when start 'FLAG_ACTIVITY_CLEAR_TOP' Activity." am: 5fa55ef1c8 am: 5c917b8fdf am: fad3804904 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553956

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I839d7d8c25d29d740f7346ea9a4cbcc31be3a396
 2021-02-04 01:43:20 +00:00
Brad Ebinger
36ba58f32b Merge "Define FEATURE_TELEPHONY_IMS_SINGLE_REGISTRATION feature" am: 8cb6d95803 am: a30ce7ea41 am: 5bbee4a0bb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564832

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I65ab2d2c40512291e34f64e6ac070fbae4d20475
 2021-02-04 01:42:57 +00:00
Benjamin Schwartz
d42057fc61 Merge "BatteryStats: Pull subsystem stats from Power Stats Service" into sc-dev 2021-02-04 01:39:09 +00:00
Andy Hung
1d55f0d409 Merge "AudioRecord: Fix permission documention" into sc-dev 2021-02-04 01:35:02 +00:00
Ming-Shin Lu
51158471ae Merge "Fix app afterimage flashing while device unlocking" into sc-dev 2021-02-04 01:29:18 +00:00