Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
640,750 Commits 3 Branches 0 Tags
beec86fed48d525ef4a293607233de85cb595d5e
Commit Graph

640750 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chiachang Wang
beec86fed4 Merge "Use UserHandle#getUid() taken a UserId" into sc-dev am: 1618a4df47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14122529

Change-Id: I196dca2df8df6714743535d1d70e6ed64d53db93
 2021-04-09 03:22:33 +00:00
TreeHugger Robot
e65eafce4d Merge "Remove carrier prefix before displaying emergency numbers" into sc-dev am: 48663c1310 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14116968

Change-Id: I5a70cde237d020ff404432377666e26693b6d0d9
 2021-04-09 03:21:50 +00:00
Chiachang Wang
1618a4df47 Merge "Use UserHandle#getUid() taken a UserId" into sc-dev 2021-04-09 02:30:20 +00:00
TreeHugger Robot
48663c1310 Merge "Remove carrier prefix before displaying emergency numbers" into sc-dev 2021-04-09 02:29:21 +00:00
Remi NGUYEN VAN
746aee1fd3 Merge "Replace IS_DEBUGGABLE with isDebuggable module API" am: ba77876dbd am: 4290766ae7 am: 116bab20ab am: 6c9d7a5c75 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1667304

Change-Id: I53ddc1fffdd2ca55017f8cbac62a9a6e2b33aa9a
 2021-04-09 01:48:58 +00:00
Remi NGUYEN VAN
de83db1dd1 [automerger skipped] Merge "Use String in CaptivePortalData underlying types" am: 13d7d5cde6 am: 061a4f93c0 am: 04ca7708ec -s ours am: 9dd7f6da21 -s ours 
am skip reason: skip tag Change-Id Ifa3ea9aae0cabf5757791c4ae13e6f551759ed97 with SHA-1 8d3d54567b is already in history

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

Change-Id: I2c8c4ed13e188e97c1a81b6f279d67703ba62949
 2021-04-09 01:47:22 +00:00
Chiachang Wang
6c38698e0b Merge "Remove hidden connectivity method usage" into sc-dev am: 1c3654fbd8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14124569

Change-Id: Ia30462855489a03136ac425725086c6fe05b0959
 2021-04-09 01:46:18 +00:00
Remi NGUYEN VAN
6c9d7a5c75 Merge "Replace IS_DEBUGGABLE with isDebuggable module API" am: ba77876dbd am: 4290766ae7 am: 116bab20ab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1667304

Change-Id: I3a64653b1a9cb283ba04d4c5a363d3b44fa7b987
 2021-04-09 01:30:00 +00:00
Remi NGUYEN VAN
9dd7f6da21 [automerger skipped] Merge "Use String in CaptivePortalData underlying types" am: 13d7d5cde6 am: 061a4f93c0 am: 04ca7708ec -s ours 
am skip reason: skip tag Change-Id Ifa3ea9aae0cabf5757791c4ae13e6f551759ed97 with SHA-1 8d3d54567b is already in history

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

Change-Id: I5bf71b3f1f938d06eae5c3739af081d49ea3777b
 2021-04-09 01:29:27 +00:00
Chiachang Wang
1c3654fbd8 Merge "Remove hidden connectivity method usage" into sc-dev 2021-04-09 01:28:25 +00:00
Matt Pietal
7dc8addf67 Revert^3 "Enable smartspace" am: 20744ed3b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14126753

Change-Id: Ic80d777e95b5ba6ffc9ca74dca9bdabddd1d1ab0
 2021-04-09 01:27:18 +00:00
Wei Sheng Shih
ccf4f3bc6e Merge "Ignore windowDisablePreview when launching from system surface." into sc-dev am: a8b73e2075 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14060614

Change-Id: Id71a472d51230eb640b3eb7b9d07f4eabf410b72
 2021-04-09 01:27:01 +00:00
Jing Ji
44fe675e9a Merge "Acquire proc lock prior to the call into AM service connection holder" into sc-dev am: db4ff9ef89 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14129138

Change-Id: I88438aeea7dfc89b4cad6afa24c8abcd8b1bb798
 2021-04-09 01:26:35 +00:00
Benedict Wong
2f52aa88f1 Merge changes I77e34a92,I8f13159b,Ic8ab66ff,Id9494f69 am: e19a117397 am: f9f0f6f10b am: 887eac8d5e am: e7c7e61410 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1666342

Change-Id: I7de6c2abebf85b9eb8f95dbaceedfc7473251974
 2021-04-09 01:26:14 +00:00
Paul Duffin
cdc90212de Merge "Remove unnecessary entries in frameworks/base/config/OWNERS" am: a2baa71441 am: e9ec371853 am: a8329471e4 am: 3f0bc6b4ba 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1665364

Change-Id: I99ca2fa3858a7acc832970b713ba9b78710b228d
 2021-04-09 01:25:33 +00:00
Nathan Harold
ffafc7979a [automerger skipped] Merge "s/enforece/enforce/" am: 271d82e966 am: fa9eca97b7 am: a2809aa39f -s ours am: f9ac9e6191 -s ours 
am skip reason: skip tag Change-Id I8559564a5a68fee4ed8b0543cc91ea3ca7dc36ee with SHA-1 41105e5721 is already in history

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

Change-Id: I6ce5e22ff4bae4b0b18a280696df29e77718e537
 2021-04-09 01:24:55 +00:00
Remi NGUYEN VAN
116bab20ab Merge "Replace IS_DEBUGGABLE with isDebuggable module API" am: ba77876dbd am: 4290766ae7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1667304

Change-Id: Iaec8ac01bbb518af8e14c0936cf8d8f2f75d8dd4
 2021-04-09 01:24:14 +00:00
Remi NGUYEN VAN
04ca7708ec Merge "Use String in CaptivePortalData underlying types" am: 13d7d5cde6 am: 061a4f93c0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644997

Change-Id: I6a1cf633329d2b3cb90a0ea68e946777f9feff89
 2021-04-09 01:23:58 +00:00
Steven Moreland
2fc524092f Merge "reflect libbinder/am split" am: da164b6f83 am: af31a081dc am: 1dce7fe5f7 am: 78d1322829 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664801

Change-Id: Ia98193ebfaab4b4a409b3b572eb60c44b9dadd87
 2021-04-09 01:23:48 +00:00
Matt Pietal
20744ed3b4 Revert^3 "Enable smartspace" 
3b67a00d95

Change-Id: I4711f24b1ed3535dbf40ffd6ab893e6cd661fe49
 2021-04-08 18:16:22 -07:00
Wei Sheng Shih
a8b73e2075 Merge "Ignore windowDisablePreview when launching from system surface." into sc-dev 2021-04-09 01:09:34 +00:00
Jing Ji
db4ff9ef89 Merge "Acquire proc lock prior to the call into AM service connection holder" into sc-dev 2021-04-09 01:08:51 +00:00
Benedict Wong
e7c7e61410 Merge changes I77e34a92,I8f13159b,Ic8ab66ff,Id9494f69 am: e19a117397 am: f9f0f6f10b am: 887eac8d5e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1666342

Change-Id: Ie2ec6f0a2eb26283ff0058ada398a81ccaaccc04
 2021-04-09 01:06:25 +00:00
Remi NGUYEN VAN
4290766ae7 Merge "Replace IS_DEBUGGABLE with isDebuggable module API" am: ba77876dbd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1667304

Change-Id: I52e7aaca589eefb385cec78bf4372922d8089018
 2021-04-09 01:05:40 +00:00
Paul Duffin
3f0bc6b4ba Merge "Remove unnecessary entries in frameworks/base/config/OWNERS" am: a2baa71441 am: e9ec371853 am: a8329471e4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1665364

Change-Id: I41bcbbc966570eb53feb276ff89a65b9854d92c3
 2021-04-09 01:05:37 +00:00
Nathan Harold
f9ac9e6191 [automerger skipped] Merge "s/enforece/enforce/" am: 271d82e966 am: fa9eca97b7 am: a2809aa39f -s ours 
am skip reason: skip tag Change-Id I8559564a5a68fee4ed8b0543cc91ea3ca7dc36ee with SHA-1 41105e5721 is already in history

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

Change-Id: Ifb9eeac33e8bf354adf7ec582d12339c4994138d
 2021-04-09 01:05:09 +00:00
Steven Moreland
78d1322829 Merge "reflect libbinder/am split" am: da164b6f83 am: af31a081dc am: 1dce7fe5f7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664801

Change-Id: I8660183c096247c25ee6c1893caba37d5848a66b
 2021-04-09 01:04:35 +00:00
Remi NGUYEN VAN
061a4f93c0 Merge "Use String in CaptivePortalData underlying types" am: 13d7d5cde6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644997

Change-Id: If054ef1739a273e4a203be44675d3b410784dedf
 2021-04-09 01:00:10 +00:00
Steven Moreland
c04fc646bf Merge "reflect libbinder/am split" into sc-dev am: 544010a9b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14128938

Change-Id: Ia64a2e7b45fc66f39b8b49b4a62c15cc8435d51b
 2021-04-09 00:59:53 +00:00
Steven Moreland
544010a9b2 Merge "reflect libbinder/am split" into sc-dev 2021-04-09 00:49:23 +00:00
Remi NGUYEN VAN
5efefe36b8 Merge "Make service-connectivity APEX-only" into sc-dev am: 1bec64d1cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14097784

Change-Id: I68f65727424d4b9511cdfc258ac97804baa51be1
 2021-04-09 00:37:13 +00:00
Remi NGUYEN VAN
ba77876dbd Merge "Replace IS_DEBUGGABLE with isDebuggable module API" 2021-04-09 00:19:19 +00:00
Remi NGUYEN VAN
1bec64d1cb Merge "Make service-connectivity APEX-only" into sc-dev 2021-04-09 00:18:35 +00:00
Remi NGUYEN VAN
13d7d5cde6 Merge "Use String in CaptivePortalData underlying types" 2021-04-09 00:17:59 +00:00
Lucas Dupin
5dcc8f8e4e Merge "Ripple radius bug" into sc-dev am: ad14c212bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14128018

Change-Id: I0b2d891c296dcdf7e13ce78cf80beb6192fecb88
 2021-04-08 23:58:16 +00:00
Jason Chang
9e86d29001 Merge "Fix Talk back announces "Exit one handed mode" on every orientation change though one-handed mode is off" into sc-dev am: c16a826d85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13990315

Change-Id: I9aca3710828972ebd621e831716f2d2beb18fbb3
 2021-04-08 23:58:01 +00:00
TreeHugger Robot
13d7be8e3f Merge "Add link to CDM profiles info to javadoc" into sc-dev am: 0e8b4aefd8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13828991

Change-Id: Ie2ff54a7f7c0155663cdcdb491d76a934d912dbe
 2021-04-08 23:57:45 +00:00
Lucas Dupin
186b326b03 Merge "Set accent color to A1-100" into sc-dev am: 974db61fc8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14129972

Change-Id: Ife2900e8dc33e9c49232ebdd5783256abf794c23
 2021-04-08 23:57:26 +00:00
Lucas Dupin
1bab795270 Merge "Correctly fade sparkles in" into sc-dev am: 990702017c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14129557

Change-Id: I5a4d2a0ce39456740b078a74b25e768033549aea
 2021-04-08 23:56:43 +00:00
Steven Moreland
8e6aa6679e reflect libbinder/am split 
(manual cherry-pick from AOSP to fix merge conflict)

Minimizing cost for using libbinder.

Bug: 183654927
Test: boot
Change-Id: I1a4785a58afcaf2d312ef52a07f41fe3dd3a8fa6
 2021-04-08 23:56:27 +00:00
Lucas Dupin
ad14c212bc Merge "Ripple radius bug" into sc-dev 2021-04-08 23:49:41 +00:00
Jason Chang
c16a826d85 Merge "Fix Talk back announces "Exit one handed mode" on every orientation change though one-handed mode is off" into sc-dev 2021-04-08 23:46:39 +00:00
TreeHugger Robot
0e8b4aefd8 Merge "Add link to CDM profiles info to javadoc" into sc-dev 2021-04-08 23:40:59 +00:00
Lucas Dupin
974db61fc8 Merge "Set accent color to A1-100" into sc-dev 2021-04-08 23:30:00 +00:00
Lucas Dupin
990702017c Merge "Correctly fade sparkles in" into sc-dev 2021-04-08 23:28:56 +00:00
Roman Kiryanov
7eb1a6f4fd Merge "Separate the emulator specific part of ClipboardService.java" into sc-dev am: d43f23c491 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14116965

Change-Id: Iae768cc98ca47c80e0bb90064c4c2e5b3b3602a6
 2021-04-08 23:16:07 +00:00
Paul Duffin
35347e0c2b Merge "Update hiddenapi preupload checks to handle new location" am: ca0501d1b8 am: 0c71f7c0a4 am: 48c3dadc6a am: 35e8681954 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1668445

Change-Id: Iee3960c427658a9c0ed881096b14999c4716c42b
 2021-04-08 23:15:57 +00:00
James Mattis
6967cfcb50 Merge "Adding OEM Network Preferences for testing" am: 240eb9907b am: 67fc786ade am: 96900dc792 am: 75985d469f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659163

Change-Id: I2d436fb21c92438feeb5e8493d4e341a30fd3f87
 2021-04-08 23:14:58 +00:00
Kevin Chyn
e2857c8a29 Merge "Fix flaky UserAwareBiometricSchedulerTest" into sc-dev am: cf062b19c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14129973

Change-Id: Ic720404d1c3bf56795cea406a7e7b890bcb9717a
 2021-04-08 23:14:09 +00:00
Roman Kiryanov
d43f23c491 Merge "Separate the emulator specific part of ClipboardService.java" into sc-dev 2021-04-08 23:01:35 +00:00