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

570527 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
bbf4c3c2ce Merge "Add getters to NetworkStateSnapshot" am: 2f83b6a72d am: 289a438f06 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684649

Change-Id: Ia6047f77624d6be82dc2528f52f7c77bf5b29c17
 2021-04-29 10:02:43 +00:00
Treehugger Robot
289a438f06 Merge "Add getters to NetworkStateSnapshot" am: 2f83b6a72d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684649

Change-Id: I3263514a5d75141c81e5f9d7389603ed369e95df
 2021-04-29 09:39:19 +00:00
Treehugger Robot
2f83b6a72d Merge "Add getters to NetworkStateSnapshot" 2021-04-29 09:20:34 +00:00
Treehugger Robot
2d96bac3aa Merge "Add getters to UnderlyingNetworkInfo" am: e2e8b9ce88 am: b2551d4cc9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684651

Change-Id: I33d2bbca5a72ab8500a7886073c9f4c4d1b84925
 2021-04-29 08:57:50 +00:00
Treehugger Robot
b2551d4cc9 Merge "Add getters to UnderlyingNetworkInfo" am: e2e8b9ce88 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684651

Change-Id: I97222bb04bdea78178741245016658cad7f082dc
 2021-04-29 08:16:36 +00:00
Treehugger Robot
e2e8b9ce88 Merge "Add getters to UnderlyingNetworkInfo" 2021-04-29 07:29:08 +00:00
Tianjie Xu
af1f784ee0 Merge changes Ia43ab0ab,I0c4b91aa am: 474d549f7c am: 38762c75d1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690266

Change-Id: I527307961df8d8e8932b704cb63c959b0f6f4ee8
 2021-04-29 06:02:44 +00:00
Tianjie Xu
38762c75d1 Merge changes Ia43ab0ab,I0c4b91aa am: 474d549f7c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690266

Change-Id: Iaf1b2b66a8e396d7e0670ef6967347f6878c14ee
 2021-04-29 05:35:46 +00:00
Treehugger Robot
97a9cfb605 Merge "Rename getAllNetworkStateSnapshot which should be pluralized" am: d1473b36d6 am: 4ed0a5060a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684034

Change-Id: I0fa34d7cddaede25898d262196804bdd327caf8e
 2021-04-29 05:28:28 +00:00
Benedict Wong
33d2807b02 Merge "Update set|getRetryIntervalsMs to Millis" am: c6fe30068d am: 058149884f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688783

Change-Id: Ie3a9bf8043ce00fe838720c094b5b180af829910
 2021-04-29 05:26:56 +00:00
Tianjie Xu
474d549f7c Merge changes Ia43ab0ab,I0c4b91aa 
* changes:
  Always use the server based provider if HAL isn't installed
  Dump the IOexception before retrying load escrow key
 2021-04-29 05:17:55 +00:00
Treehugger Robot
4ed0a5060a Merge "Rename getAllNetworkStateSnapshot which should be pluralized" am: d1473b36d6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684034

Change-Id: Ie83813d57b678de4f60fe8e70aa1aa42d74a0bc8
 2021-04-29 05:07:31 +00:00
Benedict Wong
058149884f Merge "Update set|getRetryIntervalsMs to Millis" am: c6fe30068d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688783

Change-Id: I0ddfd92b8d08c58b2318a5bbd2a8a4bb6edbc8f9
 2021-04-29 05:01:27 +00:00
Yi Kong
a9a873f0a9 Merge "profcollect: alternative property to start profcollectd" am: 67bea71a2f am: f965ffe0e2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689805

Change-Id: I52018c828c4a8e6325df0d0845a8ced930ec9a0d
 2021-04-29 05:01:11 +00:00
Treehugger Robot
d1473b36d6 Merge "Rename getAllNetworkStateSnapshot which should be pluralized" 2021-04-29 04:40:51 +00:00
Benedict Wong
c6fe30068d Merge "Update set|getRetryIntervalsMs to Millis" 2021-04-29 04:35:45 +00:00
Yi Kong
f965ffe0e2 Merge "profcollect: alternative property to start profcollectd" am: 67bea71a2f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689805

Change-Id: I514172bcc3d10a7e5b2ed6be8dec81eff6a6c299
 2021-04-29 04:23:19 +00:00
Yi Kong
67bea71a2f Merge "profcollect: alternative property to start profcollectd" 2021-04-29 04:02:10 +00:00
Treehugger Robot
7c32a3f599 Merge "[Telephony] Remove getChannelNumber from SDK" am: cadc1f6086 am: b5dfa219ba 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687486

Change-Id: I841fba8b27bff32fbe006192c093e43701662750
 2021-04-29 03:37:00 +00:00
Treehugger Robot
3bbfa132e8 Merge "Internal graphics package owners" am: 1084a81a68 am: 8f7c666464 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690227

Change-Id: Ic7ba3d5ea2be74c0860eb61d80aac078e17b48de
 2021-04-29 03:35:43 +00:00
Treehugger Robot
b5dfa219ba Merge "[Telephony] Remove getChannelNumber from SDK" am: cadc1f6086 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687486

Change-Id: I2d204e0a71f830480a1000331b293e9dc31a02b2
 2021-04-29 03:07:58 +00:00
Treehugger Robot
8f7c666464 Merge "Internal graphics package owners" am: 1084a81a68 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690227

Change-Id: I78f22ba11a23177c00b54c35141812c462812f7b
 2021-04-29 03:01:13 +00:00
Aemon Cannon
5093945440 Merge "Add instrumented app to JAR path (isolated splits)" into qt-qpr1-dev am: d2317d0fac am: 9769b95c31 am: 6390c11497 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14240125

Change-Id: I84763867a720d4b22e25b3a8b801a727bc80781a
 2021-04-29 03:00:15 +00:00
Treehugger Robot
cadc1f6086 Merge "[Telephony] Remove getChannelNumber from SDK" 2021-04-29 01:20:15 +00:00
Treehugger Robot
1084a81a68 Merge "Internal graphics package owners" 2021-04-29 00:55:03 +00:00
Aemon Cannon
6390c11497 Merge "Add instrumented app to JAR path (isolated splits)" into qt-qpr1-dev am: d2317d0fac am: 9769b95c31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14240125

Change-Id: I3583e375da79b70dfad84612eb987adad0b73c24
 2021-04-29 00:13:49 +00:00
Aemon Cannon
9769b95c31 Merge "Add instrumented app to JAR path (isolated splits)" into qt-qpr1-dev am: d2317d0fac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14240125

Change-Id: Id18fda9f958e8b4555a044c866f7f695c440856a
 2021-04-28 23:19:50 +00:00
Treehugger Robot
faf48c00ae Merge "Expose carrier privilege rules certificates as @TestApi." am: c2c84d169a am: 1819888bfb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683909

Change-Id: I03d4f77bd168d642e2fa2514beb3fc2033cd39cf
 2021-04-28 23:11:58 +00:00
Treehugger Robot
0b5edbb77f Merge "Update OWNERS for CachedAppOptimizer" am: 6ed3f581bb am: da34aa41a8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684130

Change-Id: Ia596c766764b8a235811ee75b9d5ba4e020c02b9
 2021-04-28 23:11:35 +00:00
Aemon Cannon
d2317d0fac Merge "Add instrumented app to JAR path (isolated splits)" into qt-qpr1-dev 2021-04-28 22:38:41 +00:00
Treehugger Robot
1819888bfb Merge "Expose carrier privilege rules certificates as @TestApi." am: c2c84d169a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683909

Change-Id: I9ddeafeacae76ecc4aa80eecd6503b2fea8378b9
 2021-04-28 22:28:31 +00:00
Tianjie
adc5a1d764 Always use the server based provider if HAL isn't installed 
If the device doesn't have the reboot escorw HAL, default the provider
to server-based. It helps OEM testing before our P/H flag rollout;
because most OEM devices don't install the HAL.

Test: unittests
Change-Id: Ia43ab0abb769bbf8e11e61841f4a647ae2acc6be
 2021-04-28 15:24:47 -07:00
Treehugger Robot
da34aa41a8 Merge "Update OWNERS for CachedAppOptimizer" am: 6ed3f581bb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684130

Change-Id: Ifb144bc700a0e2e730aa99bc8875873a86c37461
 2021-04-28 22:21:50 +00:00
Julia Reynolds
c44348150d [automerger skipped] Restrict alarm broadcast am: f1e84b42b1 -s ours am: eaf40f342d -s ours am: 26925dd638 -s ours am: a0d1066582 -s ours 
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 7dfcfe85ae is already in history

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

Change-Id: I19491880ed7817982f83dcb2ea8d180b73733cfd
 2021-04-28 22:21:33 +00:00
Todd Kennedy
2678377c4b Merge "PackageParser OWNERS noparent" am: 26a5186ab1 am: 159886625a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688565

Change-Id: I40770bf3f2d5c706cd578548be07f4fa1f5f4565
 2021-04-28 22:15:56 +00:00
Treehugger Robot
c2c84d169a Merge "Expose carrier privilege rules certificates as @TestApi." 2021-04-28 22:13:50 +00:00
Treehugger Robot
6ed3f581bb Merge "Update OWNERS for CachedAppOptimizer" 2021-04-28 22:07:27 +00:00
Julia Reynolds
a0d1066582 [automerger skipped] Restrict alarm broadcast am: f1e84b42b1 -s ours am: eaf40f342d -s ours am: 26925dd638 -s ours 
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 7dfcfe85ae is already in history

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

Change-Id: Ib3bb54f4f504df1672899a7470ad66abe6d77cab
 2021-04-28 22:06:50 +00:00
Todd Kennedy
159886625a Merge "PackageParser OWNERS noparent" am: 26a5186ab1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688565

Change-Id: I7ecf3b8cbaff927662f8288e7e0f53e8c3303d05
 2021-04-28 21:51:15 +00:00
Julia Reynolds
26925dd638 [automerger skipped] Restrict alarm broadcast am: f1e84b42b1 -s ours am: eaf40f342d -s ours 
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 7dfcfe85ae is already in history

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

Change-Id: Iaf9103ad8ba918cd3b836cc2ad63c07ef350a5e1
 2021-04-28 21:50:41 +00:00
Todd Kennedy
26a5186ab1 Merge "PackageParser OWNERS noparent" 2021-04-28 21:28:50 +00:00
Julia Reynolds
eaf40f342d [automerger skipped] Restrict alarm broadcast am: f1e84b42b1 -s ours 
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 7dfcfe85ae is already in history

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

Change-Id: If58dd4cc98f8ac2066b79f274e99a0a5169c0d9a
 2021-04-28 21:18:10 +00:00
Lucas Dupin
56b401709b Internal graphics package owners 
Bug: 186640057
Test: none
Change-Id: I59af9cbaa0fbc1b3206b9b3d852e845413aa9e71
 2021-04-28 14:09:00 -07:00
Treehugger Robot
f546892ff4 Merge "Change the brackets in Arabic keyboard layout." am: 48144472ff am: b7ae4468fb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688784

Change-Id: I846bf1183066c2223c5ff41c8bd2ddfd89c73288
 2021-04-28 19:52:34 +00:00
Paul Crowley
9c975f2335 Merge changes from topic "biometric-unlocked-required" am: c36995ec84 am: cf5f4d6cbf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671106

Change-Id: I47281e410de8edf621836a501596419ea0cc1d7c
 2021-04-28 19:51:56 +00:00
Yifan Hong
a4f89e68a6 Merge "AndroidRuntime.h: do not include IBinder.h" am: 92bd842472 am: 5d5581dc96 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687048

Change-Id: I5caed327131ff8c9f589046d05e42ff3f5998529
 2021-04-28 19:51:05 +00:00
Andrei-Valentin Onea
d2a270b4e0 Merge "Replace source based system server stubs" am: e93cf9e566 am: fef2035b4f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1642060

Change-Id: I7cb9f20139da99292954aa42985d1a7fcb1dc78e
 2021-04-28 19:49:38 +00:00
Treehugger Robot
b7ae4468fb Merge "Change the brackets in Arabic keyboard layout." am: 48144472ff 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688784

Change-Id: I65121f1590d7f93db73b4a3d360b7ae9efed9d40
 2021-04-28 19:37:37 +00:00
Paul Crowley
cf5f4d6cbf Merge changes from topic "biometric-unlocked-required" am: c36995ec84 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671106

Change-Id: I1bcdf2d01a8f4b81f1ebdc0e475db461c390bda6
 2021-04-28 19:23:40 +00:00
Yifan Hong
5d5581dc96 Merge "AndroidRuntime.h: do not include IBinder.h" am: 92bd842472 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687048

Change-Id: Iee1fa3cb4d9c9218f7ca6ada40381b0bf16f14b1
 2021-04-28 19:12:34 +00:00