Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
498,546 Commits 3 Branches 0 Tags
9fc65eb28d3d359d9350f07b7ee513d9bf46e519
Commit Graph

498546 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mohammad Samiul Islam
9fc65eb28d Merge changes from topic "abandon-race" into rvc-dev am: 6b58f8ca37 am: 36642fc22e 
Change-Id: I609495ab4665b12309a663eb8a2589d03e7cd18c
 2020-05-07 13:14:48 +00:00
Mohammad Samiul Islam
36642fc22e Merge changes from topic "abandon-race" into rvc-dev am: 6b58f8ca37 
Change-Id: Iac92f0bc594e3bf1a08e655d8c3daa853c189e8a
 2020-05-07 13:01:42 +00:00
Mohammad Samiul Islam
6b58f8ca37 Merge changes from topic "abandon-race" into rvc-dev 
* changes:
  Fix racing condition between session abandonment and its verification
  Persist destroyed staged sessions until they are cleaned up
 2020-05-07 12:51:15 +00:00
Matt Pietal
d0582df887 Merge "Sharesheet/Resolver a11y adjustments" into rvc-dev am: 2f16758a0a am: 01bd497efe 
Change-Id: I3b2034f9ed2644ba2ea178e18ad12b4716ebc5e3
 2020-05-07 12:11:15 +00:00
Automerger Merge Worker
a431b3d6a0 Merge "Merge "Cancel existing animations when detaching View" into rvc-dev am: b3c02592e1 am: c7336cdf18" into rvc-d1-dev-plus-aosp 2020-05-07 12:10:42 +00:00
Jorim Jaggi
6e4c0f7b3f Merge "Cancel existing animations when detaching View" into rvc-dev am: b3c02592e1 am: c7336cdf18 
Change-Id: I56ffd47266afd1513db4839fd1afb3771b9ae0c6
 2020-05-07 12:10:36 +00:00
Matt Pietal
d0df94ac26 Merge "Sharesheet/Resolver a11y adjustments" into rvc-dev am: 2f16758a0a am: 822d405bfc 
Change-Id: Ic60da889d7c5c041d7673fa8abcb15ac4bc0193f
 2020-05-07 12:10:31 +00:00
Jorim Jaggi
356e907d3b Merge "Cancel existing animations when detaching View" into rvc-dev am: b3c02592e1 am: c20c5a5de1 
Change-Id: I0565254b0398e71e789ed3229e480dbb86f0c6da
 2020-05-07 12:10:13 +00:00
Matt Pietal
01bd497efe Merge "Sharesheet/Resolver a11y adjustments" into rvc-dev am: 2f16758a0a 
Change-Id: I52c4629ff2e5021209031b4b535e90e7c3c226e2
 2020-05-07 11:53:53 +00:00
Matt Pietal
822d405bfc Merge "Sharesheet/Resolver a11y adjustments" into rvc-dev am: 2f16758a0a 
Change-Id: I8b6caddc1677b5ce895418bef2c7e83ea5ea5dff
 2020-05-07 11:53:50 +00:00
Jorim Jaggi
c20c5a5de1 Merge "Cancel existing animations when detaching View" into rvc-dev am: b3c02592e1 
Change-Id: I5138c2ed3d2aa43e8c0cbe8ff5e5a88a3d47689c
 2020-05-07 11:53:24 +00:00
Jorim Jaggi
c7336cdf18 Merge "Cancel existing animations when detaching View" into rvc-dev am: b3c02592e1 
Change-Id: Ib19d28b5dd5ce4428f62bf5877881093ec6d49e2
 2020-05-07 11:53:18 +00:00
Matt Pietal
2f16758a0a Merge "Sharesheet/Resolver a11y adjustments" into rvc-dev 2020-05-07 11:38:59 +00:00
Jorim Jaggi
b3c02592e1 Merge "Cancel existing animations when detaching View" into rvc-dev 2020-05-07 11:36:11 +00:00
Mark Chien
85c393c846 Merge "Refactor the EntitlementManager" am: 741e2db5d2 am: 6dc0be2b69 am: 3ee8de4ecd 
Change-Id: I5b3093d1aa1085293bdc092cc0bdc643669d04cc
 2020-05-07 11:27:21 +00:00
Jeongik Cha
3a9a976856 Merge "Use stable networkstack-aidl-interfaces" am: 339f9df7d7 am: 19db347595 am: bd62d13b58 
Change-Id: Ife21d79d591d6ce773e0fc550cb2227c3dc28018
 2020-05-07 11:26:47 +00:00
Mark Chien
3ee8de4ecd Merge "Refactor the EntitlementManager" am: 741e2db5d2 am: 6dc0be2b69 
Change-Id: Ib409b85729972e23242551beb39638aaefad0584
 2020-05-07 11:26:35 +00:00
Antoan Angelov
2307aa0fb6 Merge "Fix sharesheet scroll jankiness." into rvc-dev am: afbd12c4ed am: 24d24cfd27 
Change-Id: Ic5271d13492020737e52ffc60b92a7df5efded51
 2020-05-07 11:26:19 +00:00
Jeongik Cha
bd62d13b58 Merge "Use stable networkstack-aidl-interfaces" am: 339f9df7d7 am: 19db347595 
Change-Id: Ie5671f3b65a314a1b4f8be9917e02da408e00a53
 2020-05-07 11:26:19 +00:00
Antoan Angelov
67c29d47b1 Merge "Fix sharesheet scroll jankiness." into rvc-dev am: afbd12c4ed am: 78ace3ceb6 
Change-Id: I90b09544d57f5c1ce1b8a972f926a4411d71b06f
 2020-05-07 11:25:49 +00:00
Mark Chien
6dc0be2b69 Merge "Refactor the EntitlementManager" am: 741e2db5d2 
Change-Id: I20f7b03356592cd184b695e4ceb491d4b04cde14
 2020-05-07 11:19:16 +00:00
Mark Chien
741e2db5d2 Merge "Refactor the EntitlementManager" 2020-05-07 11:14:40 +00:00
Jeongik Cha
19db347595 Merge "Use stable networkstack-aidl-interfaces" am: 339f9df7d7 
Change-Id: I278f01d4c8e31913bbc1151bd4733ff8158111d0
 2020-05-07 11:12:50 +00:00
Antoan Angelov
78ace3ceb6 Merge "Fix sharesheet scroll jankiness." into rvc-dev am: afbd12c4ed 
Change-Id: I503344659b216e68ebf7c31077332d27f9d94888
 2020-05-07 11:12:25 +00:00
Antoan Angelov
24d24cfd27 Merge "Fix sharesheet scroll jankiness." into rvc-dev am: afbd12c4ed 
Change-Id: I372f4dcba7a71adb337c8d21a3b2058908e2c943
 2020-05-07 11:12:20 +00:00
Jeongik Cha
339f9df7d7 Merge "Use stable networkstack-aidl-interfaces" 2020-05-07 10:59:05 +00:00
Antoan Angelov
afbd12c4ed Merge "Fix sharesheet scroll jankiness." into rvc-dev 2020-05-07 10:56:05 +00:00
Lucas Lin
212dfe0e4f Merge "Broadcast ACTION_NETWORK_STATS_UPDATED in NetworkStatsHandler" am: 61fbce1bde am: 7de4badef5 am: a918c2fcce 
Change-Id: I82a7e915c354b24600422a46aa8be427431e5d5e
 2020-05-07 09:45:52 +00:00
Hyunyoung Song
1d91069cff Merge "Setup default annotation to reduce byte size for launcher related atoms" into rvc-dev am: a07377d529 am: 70871929f3 
Change-Id: I1df13c17192594e8f06a3dec3624f308aa6afd33
 2020-05-07 09:37:18 +00:00
Lucas Lin
a918c2fcce Merge "Broadcast ACTION_NETWORK_STATS_UPDATED in NetworkStatsHandler" am: 61fbce1bde am: 7de4badef5 
Change-Id: I47f46d61c0cc9dacf24efc28ec900b35289eef5f
 2020-05-07 09:37:17 +00:00
Hyunyoung Song
51db9c28f9 Merge "Setup default annotation to reduce byte size for launcher related atoms" into rvc-dev am: a07377d529 am: afc43977a7 
Change-Id: Ib4d66277e611a2edcf1f88d038b8a3c8c63dcc89
 2020-05-07 09:36:55 +00:00
Hyunyoung Song
70871929f3 Merge "Setup default annotation to reduce byte size for launcher related atoms" into rvc-dev am: a07377d529 
Change-Id: I84da63a340df3efc05f46e206e9903d78e9c8775
 2020-05-07 09:21:45 +00:00
Hyunyoung Song
afc43977a7 Merge "Setup default annotation to reduce byte size for launcher related atoms" into rvc-dev am: a07377d529 
Change-Id: I907db0ff23f833d00fc9f10ee5811ce006fb56be
 2020-05-07 09:21:28 +00:00
Lucas Lin
7de4badef5 Merge "Broadcast ACTION_NETWORK_STATS_UPDATED in NetworkStatsHandler" am: 61fbce1bde 
Change-Id: I8996b46bbd71ddc27ef313e3d9d329faf56ac580
 2020-05-07 09:21:25 +00:00
Lucas Lin
61fbce1bde Merge "Broadcast ACTION_NETWORK_STATS_UPDATED in NetworkStatsHandler" 2020-05-07 09:04:39 +00:00
Hyunyoung Song
a07377d529 Merge "Setup default annotation to reduce byte size for launcher related atoms" into rvc-dev 2020-05-07 09:02:43 +00:00
Yanting Yang
eb573f7b31 Merge "Add mainline module utils function into AppUtils" into rvc-dev am: a14615426f am: 0936380678 
Change-Id: I059bb950084909462b3eb3b14de31a4ec36c4d9d
 2020-05-07 08:51:07 +00:00
Yanting Yang
cec34ba6dd Merge "Add mainline module utils function into AppUtils" into rvc-dev am: a14615426f am: 8c53e8bf48 
Change-Id: Ic81bcaf2ea63153e9656f938e7fe4741b1fdcd87
 2020-05-07 08:50:49 +00:00
lucaslin
e62726a71b Broadcast ACTION_NETWORK_STATS_UPDATED in NetworkStatsHandler 
There is a corner case which may cause the deadlock:
When NetworkStatsService tried to broadcast the intent,
NetworkStatsService was waiting for a lock which was hold by
ActivityManagerService. In the same time, ActivityManagerService
was waiting for ActiveService#startServiceInnerLocked() to get a
lock which was hold by ConnectivityService. ConnectivityService
was waiting for a lock which was hold by BatteryStatsImpl.
BatteryStatsImpl was waiting for a lock which was hold by
NetworkStatsService, and the lock was locked by
NetworkStatsService when NetworkStatsService tried to broadcast
the intent.

To prevent deadlock when broadcasting the intent in
performPollLocked(), move the intent broadcasting from
performPollLocked() to NetworkStatsHandler.

Bug: 150418178
Bug: 155155473
Test: 1. Create the second user and see if the device will
         do factory reset or not.
      2. Factory reset manually and see if there is a deadlock.
Change-Id: Icf88d3e7a38562ab15187f6c71bc8fb0486d37c0
 2020-05-07 08:49:39 +00:00
Yanting Yang
8c53e8bf48 Merge "Add mainline module utils function into AppUtils" into rvc-dev am: a14615426f 
Change-Id: I57840dc33c6c67d53856dcaa3fcdb217de13ba61
 2020-05-07 08:44:54 +00:00
Yanting Yang
0936380678 Merge "Add mainline module utils function into AppUtils" into rvc-dev am: a14615426f 
Change-Id: I40e515d609b5d6ea5a42ea5c1274f5912955f32d
 2020-05-07 08:44:51 +00:00
Yanting Yang
a14615426f Merge "Add mainline module utils function into AppUtils" into rvc-dev 2020-05-07 08:41:38 +00:00
Automerger Merge Worker
6874d9fa33 Merge "[automerger skipped] Test tethering log dump am: 66b9a4a3f0 -s ours am: a75b21e04f -s ours" into rvc-d1-dev-plus-aosp 2020-05-07 08:33:16 +00:00
Mark Chien
bb05bc28f4 [automerger skipped] Test tethering log dump am: 66b9a4a3f0 -s ours am: a75b21e04f -s ours 
am skip reason: Change-Id I01fc6969041711f7a15880144ee5eac591086ecd with SHA-1 7eabad685f is in history

Change-Id: I78de8e3ee799516adfddc81388811f1521949a8a
 2020-05-07 08:33:06 +00:00
Mark Chien
9478d3b134 [automerger skipped] Test tethering log dump am: 66b9a4a3f0 am: 412f49e8b8 -s ours 
am skip reason: Change-Id I01fc6969041711f7a15880144ee5eac591086ecd with SHA-1 7eabad685f is in history

Change-Id: Iddc0c3ca3f9d23518c95caf4bb31d0e60fcbe2bd
 2020-05-07 08:32:53 +00:00
Mark Chien
a75b21e04f [automerger skipped] Test tethering log dump am: 66b9a4a3f0 -s ours 
am skip reason: Change-Id I01fc6969041711f7a15880144ee5eac591086ecd with SHA-1 7eabad685f is in history

Change-Id: I208b2d702643e72dedb821c2517ef1f32b12e5ef
 2020-05-07 08:19:22 +00:00
Mark Chien
412f49e8b8 Test tethering log dump am: 66b9a4a3f0 
Change-Id: If48c35a4dde54b4bdd44703f3df6338267b1b542
 2020-05-07 08:19:10 +00:00
Mark Chien
66b9a4a3f0 Test tethering log dump 
Bug: 145490751
Test: atest TetheringTests
Merged-In: I01fc6969041711f7a15880144ee5eac591086ecd
Change-Id: I01fc6969041711f7a15880144ee5eac591086ecd
 2020-05-07 06:44:43 +00:00
Sarah Chin
73bdbd8362 [automerger skipped] Merge "Added a new capability for temporarily unmetered network." am: c5c7994da9 am: 09a2ff81c7 -s ours am: 1a8f7eafc9 -s ours 
am skip reason: Change-Id I10e26cb0852e67f614e7b9c4e49f95e078602e21 with SHA-1 30be5e5d3d is in history

Change-Id: I56c31471f54180a6e49cf1a72a1793618c5bec1c
 2020-05-07 06:12:55 +00:00
Automerger Merge Worker
0b58d2d867 Merge "Merge "Filter out non-a2dp or non-hearing Aid bluetooth device" into rvc-dev am: 98b14f98fa am: 886d330e09" into rvc-d1-dev-plus-aosp 2020-05-07 06:12:14 +00:00