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

640801 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan Severson
d6cc9b5a70 Merge "Update mic/cam toggles to the latest UI mocks" into sc-dev am: 81a64e22f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14024566

Change-Id: I16e67e270dca33f9e332c8e24b5e3b6d0318042f
 2021-04-09 03:26:56 +00:00
Winson Chung
4ed8beefd3 Merge "Fix issue with lagging pip movement after entering/exiting dismiss" into sc-dev am: 4cfadfd806 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14108880

Change-Id: I3f12f52194292745502d9e547aaeed628cb09b0a
 2021-04-09 03:26:41 +00:00
Winson Chung
793c798f90 Merge "Add log to verify display change is called" into sc-dev am: 550b33fced 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14129970

Change-Id: Ia53d8c008c663cc17d0db340934ba3ddbedc781b
 2021-04-09 03:26:27 +00:00
Winson Chung
dc63457ffc Merge "Add null check for base activity" into sc-dev am: 4a382d9547 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14129977

Change-Id: I0d9e33fb2c05d5e27f1b2e33f802622f965c5917
 2021-04-09 03:26:16 +00:00
TreeHugger Robot
b4a8b0f0a0 Merge "Integrated policy-exempt-apps into setLockTaskPackages()." into sc-dev am: 66a76544f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14098507

Change-Id: I8f0a7e3ac802b041e4ab2ea996bdcc88d09b6ffd
 2021-04-09 03:25:58 +00:00
Treehugger Robot
2a3d314ccf [automerger skipped] Merge "UWB: Add Reason to onRangingStop()" am: b3cbeb79a2 am: 76481e8bfb am: 6f79405bc5 -s ours am: 0740c3d7c5 -s ours 
am skip reason: skip tag Change-Id Iff880ac6d8343df784fb8cb830ec830749351820 with SHA-1 dd0543f051 is already in history

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

Change-Id: I52285c7b7460d0306f96ebc281101a556b27cfcf
 2021-04-09 03:25:19 +00:00
Treehugger Robot
e05d94952f Merge "Add documentation on EthernetNetworkSpecifier API" am: 682a98d823 am: 02471bd905 am: 7fa8f1fa68 am: 2eb331a032 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669186

Change-Id: I363487538cfd74349c860024e7aadd207c82e593
 2021-04-09 03:24:51 +00:00
Remi NGUYEN VAN
b577dd30c5 Merge "Improve documentation on simulateDataStall" am: 3dd880eca5 am: 4b24e01c29 am: 5ca9ccb568 am: 25f9e89c83 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669505

Change-Id: I66f67e2331133aada654c869ed350e41adc96ee3
 2021-04-09 03:24:33 +00:00
Remi NGUYEN VAN
69896dd065 Merge "Set ParseException constructors as public" am: e067d9618c am: 226c9332af am: 448672dada am: a3d08794bd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669051

Change-Id: Ia2ed3041b767d73a26ede33523536dbfd354bcaf
 2021-04-09 03:24:09 +00:00
Remi NGUYEN VAN
9f230a8323 Merge "Replace fields with getters in keepalive API" am: 8c5ae7e37f am: e07d038931 am: b4d44cfe7f am: 85c9c7b44f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669345

Change-Id: Iede7a4e0c7072fac3233c5ed931bea8a08be339f
 2021-04-09 03:23:40 +00:00
Remi NGUYEN VAN
b17ef47c68 Merge "Add RequiresPermission to TestNetworkManager" am: 9641e3404c am: 38d3867b89 am: c9fcf1b385 am: f00f8e572e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669187

Change-Id: I0eb520356941f2c591d9d81aa09436d415bd65dc
 2021-04-09 03:22:57 +00:00
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
Evan Severson
81a64e22f9 Merge "Update mic/cam toggles to the latest UI mocks" into sc-dev 2021-04-09 03:09:07 +00:00
Winson Chung
4cfadfd806 Merge "Fix issue with lagging pip movement after entering/exiting dismiss" into sc-dev 2021-04-09 03:08:41 +00:00
Winson Chung
550b33fced Merge "Add log to verify display change is called" into sc-dev 2021-04-09 03:06:42 +00:00
Winson Chung
4a382d9547 Merge "Add null check for base activity" into sc-dev 2021-04-09 03:06:19 +00:00
TreeHugger Robot
66a76544f2 Merge "Integrated policy-exempt-apps into setLockTaskPackages()." into sc-dev 2021-04-09 02:57:27 +00:00
Treehugger Robot
0740c3d7c5 [automerger skipped] Merge "UWB: Add Reason to onRangingStop()" am: b3cbeb79a2 am: 76481e8bfb am: 6f79405bc5 -s ours 
am skip reason: skip tag Change-Id Iff880ac6d8343df784fb8cb830ec830749351820 with SHA-1 dd0543f051 is already in history

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

Change-Id: Ia337b8d65aa827f0e0ce7a4aa9dd4076c9d0e0f7
 2021-04-09 02:37:44 +00:00
Treehugger Robot
2eb331a032 Merge "Add documentation on EthernetNetworkSpecifier API" am: 682a98d823 am: 02471bd905 am: 7fa8f1fa68 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669186

Change-Id: I350d4b3d3c3b146f48480475a21b5dbe718ffc36
 2021-04-09 02:37:18 +00:00
Remi NGUYEN VAN
25f9e89c83 Merge "Improve documentation on simulateDataStall" am: 3dd880eca5 am: 4b24e01c29 am: 5ca9ccb568 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669505

Change-Id: I9484583b0249f4f67fdf6216f9ca72b900320699
 2021-04-09 02:36:41 +00:00
Remi NGUYEN VAN
a3d08794bd Merge "Set ParseException constructors as public" am: e067d9618c am: 226c9332af am: 448672dada 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669051

Change-Id: I7b744bdacf5e5929a1d0ac60832a355ebe8ce9a9
 2021-04-09 02:35:43 +00:00
Remi NGUYEN VAN
85c9c7b44f Merge "Replace fields with getters in keepalive API" am: 8c5ae7e37f am: e07d038931 am: b4d44cfe7f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669345

Change-Id: I73f6f89eb2d1255743d10c1ec1c92770845bdd63
 2021-04-09 02:34:59 +00:00
Remi NGUYEN VAN
f00f8e572e Merge "Add RequiresPermission to TestNetworkManager" am: 9641e3404c am: 38d3867b89 am: c9fcf1b385 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669187

Change-Id: Ifba7b5b88e162caaf7c5393051f867655cf1b9fb
 2021-04-09 02:34:17 +00:00
Treehugger Robot
6f79405bc5 Merge "UWB: Add Reason to onRangingStop()" am: b3cbeb79a2 am: 76481e8bfb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1666839

Change-Id: Id92f9d49186d38e4ea9089765e4c853b8427eaf2
 2021-04-09 02:30:21 +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
Treehugger Robot
7fa8f1fa68 Merge "Add documentation on EthernetNetworkSpecifier API" am: 682a98d823 am: 02471bd905 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669186

Change-Id: I8c8cd85bed535a868a55ec82721b35738efa4ae1
 2021-04-09 02:29:15 +00:00
Treehugger Robot
76481e8bfb Merge "UWB: Add Reason to onRangingStop()" am: b3cbeb79a2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1666839

Change-Id: I0be7658e0a157f8596eef8f6e3710f565191089f
 2021-04-09 02:09:17 +00:00
Treehugger Robot
02471bd905 Merge "Add documentation on EthernetNetworkSpecifier API" am: 682a98d823 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669186

Change-Id: I3ce2800bf2719b22c16c227dc3ded9a7db8f62c7
 2021-04-09 02:03:01 +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
5ca9ccb568 Merge "Improve documentation on simulateDataStall" am: 3dd880eca5 am: 4b24e01c29 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669505

Change-Id: Ia0f2e417d06fac1695929e995b1e7c09b82a24da
 2021-04-09 01:48:09 +00:00
Remi NGUYEN VAN
448672dada Merge "Set ParseException constructors as public" am: e067d9618c am: 226c9332af 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669051

Change-Id: I07fa3e87f4faff89f35b6a3500d3ccf0f5a10e94
 2021-04-09 01:47:41 +00:00
Remi NGUYEN VAN
b4d44cfe7f Merge "Replace fields with getters in keepalive API" am: 8c5ae7e37f am: e07d038931 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669345

Change-Id: I1cf5e79229e5ffda0a77ac65b552ba0875b347f3
 2021-04-09 01:47:22 +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
Remi NGUYEN VAN
c9fcf1b385 Merge "Add RequiresPermission to TestNetworkManager" am: 9641e3404c am: 38d3867b89 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669187

Change-Id: I8208c38f4c7a81a1217cc8aeca78374171eae69a
 2021-04-09 01:46:43 +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
Treehugger Robot
b3cbeb79a2 Merge "UWB: Add Reason to onRangingStop()" 2021-04-09 01:33:40 +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
Treehugger Robot
682a98d823 Merge "Add documentation on EthernetNetworkSpecifier API" 2021-04-09 01:26:54 +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