Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
559,326 Commits 3 Branches 0 Tags
3c21dc5adeeac7bd21fa03a291b114c2fc40a8a0
Commit Graph

559326 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colin Cross
3c21dc5ade Merge "Revert "Add genrule for combined srcjar of modules"" am: 4d506d7420 am: ddf88a50cc am: 7a8204d670 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490422

Change-Id: I825e55b27c1a429ce4631599b6d8824dafc3dc91
 2020-11-06 22:53:10 +00:00
Colin Cross
7a8204d670 Merge "Revert "Add genrule for combined srcjar of modules"" am: 4d506d7420 am: ddf88a50cc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490422

Change-Id: Ia7d59ee4309645793e22fab7ecfe180e0fc768ca
 2020-11-06 21:00:00 +00:00
Colin Cross
ddf88a50cc Merge "Revert "Add genrule for combined srcjar of modules"" am: 4d506d7420 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490422

Change-Id: I61a70a6016a54fae273bc8689bd3fae5b1815dba
 2020-11-06 19:40:35 +00:00
TreeHugger Robot
b720834870 [automerger skipped] Merge changes from topic "12933478" into pi-dev am: a15664c01f -s ours am: df71b0f3a5 -s ours am: 8b8dba96db -s ours am: 4f68954df7 -s ours am: 9f415e9bad -s ours am: 655789af79 -s ours 
am skip reason: Change-Id If3b420067b4d7111dcf67ae6f98e42176158b679 with SHA-1 dd41b25a83 is in history

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

Change-Id: I9f6ff49fe952217cc681de8be3d6a4a61ed63b45
 2020-11-06 19:39:50 +00:00
Colin Cross
4d506d7420 Merge "Revert "Add genrule for combined srcjar of modules"" 2020-11-06 19:28:34 +00:00
TreeHugger Robot
655789af79 [automerger skipped] Merge changes from topic "12933478" into pi-dev am: a15664c01f -s ours am: df71b0f3a5 -s ours am: 8b8dba96db -s ours am: 4f68954df7 -s ours am: 9f415e9bad -s ours 
am skip reason: Change-Id If3b420067b4d7111dcf67ae6f98e42176158b679 with SHA-1 dd41b25a83 is in history

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

Change-Id: I280990ec81b83a3487dcd5f6b80409171e158024
 2020-11-06 19:27:49 +00:00
Colin Cross
9018bfbf0f Revert "Add genrule for combined srcjar of modules" 
This reverts commit ddf171aaf8.

Reason for revert: b/172663078

Bug: 169034951
Bug: 172663078
Change-Id: Ibd1269d72f15b43817ffec50eb94f72671e7538b
Merged-In: Ifb5f56bf5468969ad026f10186763ef604113adc
 2020-11-06 19:26:56 +00:00
vichang
44e7984238 Merge "Move WallTime out of ZoneInfoData" am: 65d1fda8f6 am: 5dbeacab6b am: 829e31941d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490736

Change-Id: Iee0bcc3e378b6d6a802e884f9a69b1d9ae68d19f
 2020-11-06 19:20:17 +00:00
Michael Sun
f9fd07e735 Merge "Update to use new android.system.suspend.control AIDL interface" am: e40aa2d118 am: b726bcfd65 am: a9b465c8d8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480304

Change-Id: I1aea5a7ddd2b6b30854683f5133906fa33aab78d
 2020-11-06 19:20:04 +00:00
James Mattis
15c0e3c9d5 Merge "Adding API stubs for application network routing" am: 20a9e59e25 am: e92d8a7865 am: ab220aa956 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478963

Change-Id: I22f8b7b15a0bc7643474f5119dd34cdddf5a8376
 2020-11-06 19:19:46 +00:00
vichang
829e31941d Merge "Move WallTime out of ZoneInfoData" am: 65d1fda8f6 am: 5dbeacab6b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490736

Change-Id: Ieb2bd3a55a452fad9e1da8bc3c85e07f5bb2a202
 2020-11-06 19:12:37 +00:00
TreeHugger Robot
9f415e9bad [automerger skipped] Merge changes from topic "12933478" into pi-dev am: a15664c01f -s ours am: df71b0f3a5 -s ours am: 8b8dba96db -s ours am: 4f68954df7 -s ours 
am skip reason: Change-Id If3b420067b4d7111dcf67ae6f98e42176158b679 with SHA-1 dd41b25a83 is in history

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

Change-Id: I5ab9ef1df0f51eb452e752c182243750b54e2f7f
 2020-11-06 19:11:48 +00:00
Michael Sun
a9b465c8d8 Merge "Update to use new android.system.suspend.control AIDL interface" am: e40aa2d118 am: b726bcfd65 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480304

Change-Id: Id1f56e447c532c81839625ccaba5e4d5f7db16aa
 2020-11-06 19:05:52 +00:00
James Mattis
ab220aa956 Merge "Adding API stubs for application network routing" am: 20a9e59e25 am: e92d8a7865 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478963

Change-Id: I7001e39dc59a509f10d7851cd9688b7b98ce0b95
 2020-11-06 19:05:22 +00:00
vichang
5dbeacab6b Merge "Move WallTime out of ZoneInfoData" am: 65d1fda8f6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490736

Change-Id: I95f99bbb58d8b25f9ce24be92669ba2916f6d70c
 2020-11-06 19:00:22 +00:00
TreeHugger Robot
4f68954df7 [automerger skipped] Merge changes from topic "12933478" into pi-dev am: a15664c01f -s ours am: df71b0f3a5 -s ours am: 8b8dba96db -s ours 
am skip reason: Change-Id If3b420067b4d7111dcf67ae6f98e42176158b679 with SHA-1 dd41b25a83 is in history

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

Change-Id: I57ac735881e725685085cae7fa2de74cd3585a9a
 2020-11-06 18:58:40 +00:00
vichang
65d1fda8f6 Merge "Move WallTime out of ZoneInfoData" 2020-11-06 18:01:08 +00:00
Michael Sun
b726bcfd65 Merge "Update to use new android.system.suspend.control AIDL interface" am: e40aa2d118 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480304

Change-Id: I5e4dda071a047dbd5d13f23898d7ea02e72ea5f1
 2020-11-06 17:39:23 +00:00
Michael Sun
e40aa2d118 Merge "Update to use new android.system.suspend.control AIDL interface" 2020-11-06 17:35:58 +00:00
James Mattis
e92d8a7865 Merge "Adding API stubs for application network routing" am: 20a9e59e25 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478963

Change-Id: I293192102c800a9dd8f09c32f890728e802cc965
 2020-11-06 17:32:56 +00:00
TreeHugger Robot
8b8dba96db [automerger skipped] Merge changes from topic "12933478" into pi-dev am: a15664c01f -s ours am: df71b0f3a5 -s ours 
am skip reason: Change-Id If3b420067b4d7111dcf67ae6f98e42176158b679 with SHA-1 dd41b25a83 is in history

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

Change-Id: Iccfdfc3b84fd4264c357af6931e137195678a704
 2020-11-06 17:12:36 +00:00
James Mattis
20a9e59e25 Merge "Adding API stubs for application network routing" 2020-11-06 17:03:25 +00:00
TreeHugger Robot
df71b0f3a5 [automerger skipped] Merge changes from topic "12933478" into pi-dev am: a15664c01f -s ours 
am skip reason: Change-Id If3b420067b4d7111dcf67ae6f98e42176158b679 with SHA-1 dd41b25a83 is in history

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

Change-Id: I61ed0598d897fccc66bb1428a72d2d344d56f08e
 2020-11-06 17:00:29 +00:00
Anton Hansson
6af2ef3ce6 Merge "Add genrule for combined srcjar of modules" am: 1452dc60ca am: 730982b142 am: c36ad8233e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1489716

Change-Id: I0d543aa3ed7c65fd388c6e4ba62092fb7b8e7792
 2020-11-06 16:30:09 +00:00
TreeHugger Robot
a15664c01f Merge changes from topic "12933478" into pi-dev 
* changes:
  Revoke permission on non-runtime -> runtime upgrade
  Ensure permissions are revoked on state changes
 2020-11-06 16:29:03 +00:00
Anton Hansson
c36ad8233e Merge "Add genrule for combined srcjar of modules" am: 1452dc60ca am: 730982b142 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1489716

Change-Id: I3d14ff9d91ca800467076916ba3b49446f97e4de
 2020-11-06 16:09:48 +00:00
Anton Hansson
730982b142 Merge "Add genrule for combined srcjar of modules" am: 1452dc60ca 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1489716

Change-Id: I32ff7332f8604278f07a832c52713ec727c2560f
 2020-11-06 15:32:51 +00:00
Anton Hansson
1452dc60ca Merge "Add genrule for combined srcjar of modules" 2020-11-06 14:55:18 +00:00
Treehugger Robot
7ff40101b8 Merge "Remove useless code" am: 646cf23c3c am: 53a2ffe768 am: 9d93c316eb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490245

Change-Id: I1e0f90254796b2e9133a9c75e41c2ca08e7c02b6
 2020-11-06 12:33:59 +00:00
vichang
18b664c70e Merge "Remove android.icu.impl.ICUBinary.dataPath for apps targeting S+" am: ffcc7427a8 am: 6cb4bb76d6 am: aa95c6d0b9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481307

Change-Id: Ibf2aa192a02fdb8fa9d52ad50ee7aca54c4b6461
 2020-11-06 12:33:27 +00:00
Treehugger Robot
9d93c316eb Merge "Remove useless code" am: 646cf23c3c am: 53a2ffe768 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490245

Change-Id: Ic92c5094ec5e593f8a8400d4001d1eb8e54e85e2
 2020-11-06 11:57:55 +00:00
vichang
aa95c6d0b9 Merge "Remove android.icu.impl.ICUBinary.dataPath for apps targeting S+" am: ffcc7427a8 am: 6cb4bb76d6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481307

Change-Id: If52898da0b66bf70ed7533bc991251a1f927f19c
 2020-11-06 11:57:38 +00:00
Victor Chang
1925c89f8f Move WallTime out of ZoneInfoData 
Bug: 139480281
Test: m droid
Change-Id: I4a81bb45e874480c7d1dd5f7736b529344d8d9fa
 2020-11-06 11:36:13 +00:00
Treehugger Robot
53a2ffe768 Merge "Remove useless code" am: 646cf23c3c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490245

Change-Id: Id5c6ab919f223fd4da2838c477d7f5665066917c
 2020-11-06 11:34:17 +00:00
vichang
6cb4bb76d6 Merge "Remove android.icu.impl.ICUBinary.dataPath for apps targeting S+" am: ffcc7427a8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481307

Change-Id: I4e4b657a908907780c7530e30b05531e1ffe1017
 2020-11-06 11:24:03 +00:00
Santiago Seifert
101ddd7bdb [automerger skipped] Merge "Add MediaMetrics support to MediaParser" into rvc-qpr-dev am: 6bd7effa4c -s ours 
am skip reason: Change-Id If51ee018da3056231910cd9c18f1b938a5c0e343 with SHA-1 9ca23a4863 is in history

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

Change-Id: Ibb1385c80ca0a3a244da0c3dc5202569c4d5263c
 2020-11-06 11:18:41 +00:00
Treehugger Robot
646cf23c3c Merge "Remove useless code" 2020-11-06 11:02:23 +00:00
Santiago Seifert
6bd7effa4c Merge "Add MediaMetrics support to MediaParser" into rvc-qpr-dev 2020-11-06 10:52:35 +00:00
vichang
ffcc7427a8 Merge "Remove android.icu.impl.ICUBinary.dataPath for apps targeting S+" 2020-11-06 10:51:53 +00:00
James Mattis
d38f48a83f Adding API stubs for application network routing 
Bug: 171795464
Test: atest FrameworksNetTests
Change-Id: Ib055aa37a7bf0c48c335307afc2258aa869c4267
 2020-11-06 00:08:13 -08:00
TreeHugger Robot
396ef95fff Merge "iorap: Add a DEBUG guide on IORap debugging log." into rvc-qpr-dev am: 4b0ec66e83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13001653

Change-Id: I65ae37fe10688188e26c0680e01dd1632b8ba3b2
 2020-11-06 07:05:36 +00:00
Chalard Jean
c74389c5fc Remove useless code 
The semantics of this block are such that restart will
only be false if all components of mArguments are null.
mArguments is a final array initialized in the
constructor of LegacyVpnRunner. The components of the
array are never overwritten (though the components of
those components are), and at least one of these
components will always be non-null (unless somebody
calls startLegacyVpnPrivileged with a non-existing
type, but that never happens).

For safety, this patch also adds a check so that
the code will crash early with a clear message if this
ever happens.

Test: FrameworksNetTests NetworkStackTests
Change-Id: I1f13aa08c6f1870c9610185b603af76f97c22bab
 2020-11-06 15:56:27 +09:00
TreeHugger Robot
4b0ec66e83 Merge "iorap: Add a DEBUG guide on IORap debugging log." into rvc-qpr-dev 2020-11-06 06:50:06 +00:00
Remi NGUYEN VAN
5352582f80 Merge "Move VPN JNI to the bottom of srcs" am: 64512597fd am: 2442a58473 am: d60841c6e4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479481

Change-Id: Id4c200a7acfa21c321865d996c795f8cf1bc2bd8
 2020-11-06 06:04:26 +00:00
Daniel Bright
50627f9058 Merge "Allows APN to be unthrottled through an indication" am: bc99f76305 am: 98a2cb4729 am: 1cf14ba648 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479020

Change-Id: I4151d7c099f8689f2b8d955f714cb6936514b96b
 2020-11-06 06:04:04 +00:00
James Mattis
29c4b9b6d2 Merge "Adding multilayered requests to NetworkRequestInfo" am: f2c37de2ba am: 2feb4fb0a0 am: c2ed1f7e81 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486199

Change-Id: I8ce428771882b8f2e2e904ebba18acdf7be2a056
 2020-11-06 06:03:37 +00:00
Remi NGUYEN VAN
d60841c6e4 Merge "Move VPN JNI to the bottom of srcs" am: 64512597fd am: 2442a58473 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479481

Change-Id: I884a464727b8f2dbf7554926dd8a0fd9cab71176
 2020-11-06 05:48:38 +00:00
Daniel Bright
1cf14ba648 Merge "Allows APN to be unthrottled through an indication" am: bc99f76305 am: 98a2cb4729 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479020

Change-Id: I0da779a79638a3c591fa49ec7538f4900dae9898
 2020-11-06 05:48:04 +00:00
James Mattis
c2ed1f7e81 Merge "Adding multilayered requests to NetworkRequestInfo" am: f2c37de2ba am: 2feb4fb0a0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486199

Change-Id: I3d013dc1a3caf9c41fbc835f2eb92df4e40bed33
 2020-11-06 05:47:26 +00:00
TreeHugger Robot
2843c95f88 [automerger skipped] Merge "Hide overlays over uninstall confirm dialog" into qt-dev am: 75826a6664 am: 0bfb8a8808 -s ours am: 0e03f74361 -s ours am: 12a6173e62 -s ours am: 0d48b8e238 -s ours 
am skip reason: Change-Id I38b6d85871064d76f2911e20acc74b4ab76406b3 with SHA-1 cdec871e66 is in history

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

Change-Id: Icd28720b0125b75ce73eb5655e3747420e4124c8
 2020-11-06 05:41:10 +00:00