Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
423,457 Commits 3 Branches 0 Tags
17ca4bbd587d52dbef75e5b9bebc7d687e19401c
Commit Graph

423457 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan Tyra
17ca4bbd58 Merge "Catch NPE in getServiceStateForSubscriber" into qt-dev am: cc36a441dd 
am: 7ca3f0d671

Change-Id: I16d64fee4e4402e22de468dab8bc9be71e67052c
 2019-05-31 20:24:02 -07:00
Govinda Wasserman
eda6b115b5 Merge "Fix SysUI-Assistant metrics logging" into qt-dev am: 1d6d10dc6f 
am: a1f99d7c7b

Change-Id: I65c3dc2e9c3cb6e454407c2ba1fc3e11d25bf3d6
 2019-05-31 20:20:49 -07:00
Evan Tyra
7ca3f0d671 Merge "Catch NPE in getServiceStateForSubscriber" into qt-dev 
am: cc36a441dd

Change-Id: Iab34493d91e46889424431191f979e3fe8d932f1
 2019-05-31 20:15:51 -07:00
Dario Freni
21ed914c21 Merge "Verify staged APKs pre-reboot." into qt-dev am: e5e876265c 
am: 74e3a49702

Change-Id: I3483dc443b288ffb25729699f9287b909c2c3ab2
 2019-05-31 20:09:39 -07:00
Govinda Wasserman
a1f99d7c7b Merge "Fix SysUI-Assistant metrics logging" into qt-dev 
am: 1d6d10dc6f

Change-Id: I3eacdcdc6a489823944578d9cb90d1970b45dbda
 2019-05-31 20:09:23 -07:00
Christopher Ferris
8587f16601 [automerger skipped] Merge "Avoid using usap when wrap property set." into qt-dev am: cbd4908c9f 
am: 9ab82236f5 -s ours
am skip reason: change_id I5f25030ce8e667d175712796c0950f38baa2532d with SHA1 6db1108ddc is in history

Change-Id: I1ba76a87eaaad1ff601c58d3018786e0b2e1c1bd
 2019-05-31 20:08:03 -07:00
Pengquan Meng
dce2c95f23 Merge "Add new WiFi Calling string without hyphen" into qt-dev am: d7673a30d9 
am: 7ce51152bf

Change-Id: Iaea6bf2d09d206957981260a65b2390ee2c154d0
 2019-05-31 20:06:41 -07:00
Dario Freni
74e3a49702 Merge "Verify staged APKs pre-reboot." into qt-dev 
am: e5e876265c

Change-Id: Icf1406811af1c425e9b934a4561457dcfd1e6495
 2019-05-31 19:51:28 -07:00
Nazanin Bakhshi
b15406a855 Merge "Supported data enabled override for different scenarios" into qt-dev am: 02e9e32b90 
am: 28e94c9795

Change-Id: I2525da3ac3cc6ed987aa694600d22bbc18d0ad4a
 2019-05-31 19:48:55 -07:00
Christopher Ferris
9ab82236f5 Merge "Avoid using usap when wrap property set." into qt-dev 
am: cbd4908c9f

Change-Id: I1a7bc0553a08923ba0ae4a808aede578250a7310
 2019-05-31 19:43:23 -07:00
Pengquan Meng
7ce51152bf Merge "Add new WiFi Calling string without hyphen" into qt-dev 
am: d7673a30d9

Change-Id: Ie29161e625fcba36dc3be19c83585c47b5e0cf62
 2019-05-31 19:42:04 -07:00
Dario Freni
6a0bf91690 Merge "Verify staged APKs pre-reboot." into qt-dev am: e5e876265c 
am: f1d9180e68

Change-Id: I35ea4865fadd0b729ac26bacb09f6e0fe1ca0c40
 2019-05-31 19:40:50 -07:00
Christopher Ferris
a180c4592a Merge "Avoid using usap when wrap property set." into qt-dev am: cbd4908c9f 
am: 62a1a7d833

Change-Id: I6061eee060e6b0dafbbd1175879bb2d2ed0edea6
 2019-05-31 19:38:10 -07:00
Pengquan Meng
bf30bd5f86 Merge "Add new WiFi Calling string without hyphen" into qt-dev am: d7673a30d9 
am: ee20b46515

Change-Id: I1c6756b79364d511c9cf08b8a2764ea5de34fd91
 2019-05-31 19:36:35 -07:00
Nazanin Bakhshi
833650ab20 Merge "Supported data enabled override for different scenarios" into qt-dev am: 02e9e32b90 
am: 2822c25b89

Change-Id: Ic4163bc70458805deb3eeacee9a6d00cfc23ac28
 2019-05-31 19:31:37 -07:00
Dario Freni
f1d9180e68 Merge "Verify staged APKs pre-reboot." into qt-dev 
am: e5e876265c

Change-Id: Id30f05784a99abbe2a4d4d21c8fc9b04f2b61525
 2019-05-31 19:16:16 -07:00
Christopher Ferris
62a1a7d833 Merge "Avoid using usap when wrap property set." into qt-dev 
am: cbd4908c9f

Change-Id: I0df94d8321e32aa2f1711af5c97446df8e6548f2
 2019-05-31 19:15:02 -07:00
Pengquan Meng
ee20b46515 Merge "Add new WiFi Calling string without hyphen" into qt-dev 
am: d7673a30d9

Change-Id: Iee7dec8eb787a21845f5d45caa7aea0dc1f54097
 2019-05-31 19:09:52 -07:00
Nazanin Bakhshi
28e94c9795 Merge "Supported data enabled override for different scenarios" into qt-dev 
am: 02e9e32b90

Change-Id: I137b668856f0501a0279137a487aabf7f92c1e15
 2019-05-31 19:09:04 -07:00
TreeHugger Robot
cc36a441dd Merge "Catch NPE in getServiceStateForSubscriber" into qt-dev 2019-06-01 01:31:17 +00:00
TreeHugger Robot
1d6d10dc6f Merge "Fix SysUI-Assistant metrics logging" into qt-dev 2019-06-01 01:28:39 +00:00
Philip P. Moltmann
0396607359 Merge "Merge "Reset SYSTEM_FIXED flags for hard restricted perms" into qt-dev am: 164404bfcb" into qt-r1-dev 
am: 137d935d54

Change-Id: I773527851400fb940a79071a4fa7347617867b89
 2019-05-31 17:35:04 -07:00
Philip P. Moltmann
d5904f26ca Merge "Reset SYSTEM_FIXED flags for hard restricted perms" into qt-dev am: 164404bfcb 
am: a88b127f46

Change-Id: I4377d3cbccf2e4e03bec95af05def066d422fb13
 2019-05-31 17:28:40 -07:00
Nazanin Bakhshi
2822c25b89 Merge "Supported data enabled override for different scenarios" into qt-dev 
am: 02e9e32b90

Change-Id: Ibf541df3b68f476257f79ff458b55edf0efba9db
 2019-05-31 17:27:12 -07:00
TreeHugger Robot
e5e876265c Merge "Verify staged APKs pre-reboot." into qt-dev 2019-06-01 00:25:51 +00:00
Philip P. Moltmann
fd0b4a0bfd Merge "Reset SYSTEM_FIXED flags for hard restricted perms" into qt-dev am: 164404bfcb 
am: caf3e9568d

Change-Id: I81833f0d9efe08fea3e3b889d595017df0cdb943
 2019-05-31 17:20:34 -07:00
Christopher Ferris
cbd4908c9f Merge "Avoid using usap when wrap property set." into qt-dev 2019-06-01 00:07:29 +00:00
Evan Tyra
c08d2d981c Catch NPE in getServiceStateForSubscriber 
ITelephony can enter a bad state with an incorrect SubId and throw an
NPE as shown in the attached bug. This is not an expected error, so a
bugreport will be triggered on userdebug builds on catch.

Test: Local
Bug: 134067547
Change-Id: Ib8f3b69eb3870c3567578aadaee6cf2693526fbd
 2019-06-01 00:02:46 +00:00
Android Build Merger (Role)
137d935d54 Merge "Merge "Reset SYSTEM_FIXED flags for hard restricted perms" into qt-dev am: 164404bfcb" into qt-r1-dev 2019-05-31 23:52:34 +00:00
Philip P. Moltmann
caf3e9568d Merge "Reset SYSTEM_FIXED flags for hard restricted perms" into qt-dev 
am: 164404bfcb

Change-Id: Ic90c9565ab1bf3ee102ee787d471885c4870e9e3
 2019-05-31 16:51:01 -07:00
Philip P. Moltmann
b7e50e3220 Merge "Reset SYSTEM_FIXED flags for hard restricted perms" into qt-dev 
am: 164404bfcb

Change-Id: Idb2ee6f3af63729e6c98fcc6f4199a1efd9502f8
 2019-05-31 16:48:53 -07:00
Philip P. Moltmann
a88b127f46 Merge "Reset SYSTEM_FIXED flags for hard restricted perms" into qt-dev 
am: 164404bfcb

Change-Id: Iddc1c06a567cac13a83ac1285c5a2bd363bc6290
 2019-05-31 16:45:16 -07:00
Fabian Kozynski
e9c7418221 Merge "Merge "DO NOT MERGE Remove Privacy Indicators" into qt-dev am: aa4545194b" into qt-dev-plus-aosp 
am: e31753dbf5

Change-Id: Ib51360e8152abbe59743f05b1257d2d5fa519f9c
 2019-05-31 16:43:44 -07:00
Fabian Kozynski
9b5c8e354a Merge "DO NOT MERGE Remove Privacy Indicators" into qt-dev am: aa4545194b 
am: 9d23380b28

Change-Id: I15dd39a9f63bb66f0c9a74a25bc16ef45da9e8ef
 2019-05-31 16:43:40 -07:00
Fabian Kozynski
c3af476eef Merge "DO NOT MERGE Remove Privacy Indicators am: 9a560e068d" into qt-dev-plus-aosp 
am: dd9c42a843

Change-Id: Ic57c7628361bd98c2b40e30f73eba0fac8067270
 2019-05-31 16:34:32 -07:00
Fabian Kozynski
01e61766eb DO NOT MERGE Remove Privacy Indicators am: 9a560e068d 
am: ee146e1dec

Change-Id: Ia14a7c3481b33abafaaf431d4efdf28a467a5f38
 2019-05-31 16:34:28 -07:00
Pengquan Meng
d7673a30d9 Merge "Add new WiFi Calling string without hyphen" into qt-dev 2019-05-31 23:31:27 +00:00
Tyler Gunn
4ec02f3403 Merge "Enhancements to conference for non-conference host scenarios." into qt-dev am: d28f0c8c78 
am: b93716cb2c

Change-Id: I4fe2f9a2cbab4d46092274a94a1b9a15438f1b4c
 2019-05-31 16:25:12 -07:00
Nazanin Bakhshi
02e9e32b90 Merge "Supported data enabled override for different scenarios" into qt-dev 2019-05-31 23:20:48 +00:00
TreeHugger Robot
164404bfcb Merge "Reset SYSTEM_FIXED flags for hard restricted perms" into qt-dev 2019-05-31 23:17:35 +00:00
Fabian Kozynski
2876778442 Merge "DO NOT MERGE Remove Privacy Indicators" into qt-dev am: aa4545194b 
am: 65c03c6951

Change-Id: Id424cfc33a3427879e162af14131b541ba60affc
 2019-05-31 16:08:40 -07:00
Android Build Merger (Role)
e31753dbf5 Merge "Merge "DO NOT MERGE Remove Privacy Indicators" into qt-dev am: aa4545194b" into qt-dev-plus-aosp 2019-05-31 23:07:27 +00:00
Android Build Merger (Role)
dd9c42a843 Merge "DO NOT MERGE Remove Privacy Indicators am: 9a560e068d" into qt-dev-plus-aosp 2019-05-31 23:07:19 +00:00
Fabian Kozynski
2804d681f0 DO NOT MERGE Remove Privacy Indicators am: 9a560e068d 
am: ec3e0ecaca

Change-Id: I395d347a18ba811f6ff84d8a873ad384e39e364f
 2019-05-31 16:05:56 -07:00
Fabian Kozynski
9d23380b28 Merge "DO NOT MERGE Remove Privacy Indicators" into qt-dev 
am: aa4545194b

Change-Id: Ie851c401e47ddefff39be69d00f3aee0bcec8cb8
 2019-05-31 16:05:49 -07:00
Fabian Kozynski
ee146e1dec DO NOT MERGE Remove Privacy Indicators 
am: 9a560e068d

Change-Id: I21b5fff862936e71eee8824a8eb45e2a38c3e245
 2019-05-31 16:05:39 -07:00
Tyler Gunn
9bfca25cd5 Merge "Enhancements to conference for non-conference host scenarios." into qt-dev am: d28f0c8c78 
am: cb3c6bfd5c

Change-Id: Ib2bdd89beb84afe1f69ae77c55e525cf3ba2b051
 2019-05-31 16:02:55 -07:00
Android Build Merger (Role)
67f6617072 Merge "Merge "Reduce calls to updateOomAdj() during unbind" into qt-dev am: 76236ec313 am: 50784ef9d2" into qt-r1-dev-plus-aosp 2019-05-31 22:58:19 +00:00
Android Build Merger (Role)
6390bb1145 Merge "Merge "Reduce calls to updateOomAdj() during unbind" into qt-dev am: 76236ec313 am: 3daf05e441" into qt-r1-dev-plus-aosp 2019-05-31 22:58:13 +00:00
Tyler Gunn
b93716cb2c Merge "Enhancements to conference for non-conference host scenarios." into qt-dev 
am: d28f0c8c78

Change-Id: I20cc08106dde823b22a7582257c1295de5c52e23
 2019-05-31 15:57:44 -07:00