Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
766,742 Commits 3 Branches 0 Tags
ceebf4ad1748bae19f6bbddd868968ce83edc4ab
Commit Graph

766742 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephanie Bak
ceebf4ad17 Merge "Expand Javadoc for DISALLOW_WIFI_TETHERING" into tm-dev am: 73b3dc4fb4 am: cae672b243 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17563878

Change-Id: I3c62e923b7500fed2c63c3d0ed5b8e397d2a4e77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 11:34:03 +00:00
Alex Buynytskyy
419650f207 Merge "Remove mInstallLock from dexopt." into tm-dev am: f5393cec0d am: 55844a251c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17570178

Change-Id: I2119c396b78637168c8e228c845379be0f8d2e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 11:33:27 +00:00
Alex Buynytskyy
57ef092b78 Merge "Remove usage of mInstallLock." into tm-dev am: 63aeabb693 am: 3af768269d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17572689

Change-Id: If296a4deacc782ff96a916e0dd4d013cb865f69f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 11:32:43 +00:00
Pablo Gamito
1f05e7347f Merge "Promote and demote flicker tests" into tm-dev am: e1dbfe84d4 am: f9d9e81f75 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17567805

Change-Id: I4afb4ed4dab45e737bd49005b9f1ea1315376873
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 11:31:28 +00:00
TreeHugger Robot
dfdb4bf3dc Merge "Don't use framework and SDK at the same time" into tm-dev am: 6166d7a7af am: d9f22fa3d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17583383

Change-Id: Ied10afbb75e7128a066434c214dfd349ed7cac72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 11:30:15 +00:00
Stephanie Bak
cae672b243 Merge "Expand Javadoc for DISALLOW_WIFI_TETHERING" into tm-dev am: 73b3dc4fb4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17563878

Change-Id: I1b8a41543adfe896ee39db58cd9fe87578c8a907
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 11:08:32 +00:00
Alex Buynytskyy
55844a251c Merge "Remove mInstallLock from dexopt." into tm-dev am: f5393cec0d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17570178

Change-Id: I3fcd112acfa2d129c1aee5436f6d58efcd335120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 11:07:40 +00:00
Alex Buynytskyy
3af768269d Merge "Remove usage of mInstallLock." into tm-dev am: 63aeabb693 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17572689

Change-Id: I82d44cdcf0d60f71a5bf9185a6ce51fbeadeb54a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 11:07:28 +00:00
Pablo Gamito
f9d9e81f75 Merge "Promote and demote flicker tests" into tm-dev am: e1dbfe84d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17567805

Change-Id: I427f704cd9e6e15de2507f41d8c5b562ac39cf3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 11:05:30 +00:00
TreeHugger Robot
d9f22fa3d0 Merge "Don't use framework and SDK at the same time" into tm-dev am: 6166d7a7af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17583383

Change-Id: Ic2a4b0c8d13654a6c18125e5ee4f9a72a286522c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 11:04:50 +00:00
Stephanie Bak
73b3dc4fb4 Merge "Expand Javadoc for DISALLOW_WIFI_TETHERING" into tm-dev 2022-04-05 10:13:39 +00:00
Alex Buynytskyy
f5393cec0d Merge "Remove mInstallLock from dexopt." into tm-dev 2022-04-05 10:09:35 +00:00
Alex Buynytskyy
63aeabb693 Merge "Remove usage of mInstallLock." into tm-dev 2022-04-05 10:09:23 +00:00
Yan Han
9b6ffc36cf Merge changes from topics "presubmit-am-7ed5c317d7b347f1a59eb332f20e8522", "presubmit-am-86ce18b053454a4db98a349f8b39985e", "presubmit-am-94d3142a4e1c418fadfd6eca6208920a", "presubmit-am-a466ed1382304d549cb550a5cae804e6" into tm-dev am: a62f32758c am: 0c089a7244 am: f9b268285a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17140464

Change-Id: Ica017ef71d15af0eb35e1ee4ab97532dc8e3763e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 10:06:58 +00:00
Nathalie Le Clair
bd7830c288 Merge "Allow for internal types in @hide API" into tm-dev am: cc3898c6d7 am: bdb2dafe03 am: 8f8e9baffb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17567131

Change-Id: I51f95e792ad6fb39de28870125f8c6aa52ca1d4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 10:06:23 +00:00
Pablo Gamito
e1dbfe84d4 Merge "Promote and demote flicker tests" into tm-dev 2022-04-05 10:00:29 +00:00
TreeHugger Robot
6166d7a7af Merge "Don't use framework and SDK at the same time" into tm-dev 2022-04-05 09:04:27 +00:00
Yan Han
0ac7b15984 Merge changes from topics "presubmit-am-7ed5c317d7b347f1a59eb332f20e8522", "presubmit-am-86ce18b053454a4db98a349f8b39985e", "presubmit-am-94d3142a4e1c418fadfd6eca6208920a", "presubmit-am-a466ed1382304d549cb550a5cae804e6" into tm-dev am: a62f32758c am: be288b8f91 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17140464

Change-Id: I10db4a56471ad2d02ee2de3325e51c75433210b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 08:51:18 +00:00
Yan Han
f9b268285a Merge changes from topics "presubmit-am-7ed5c317d7b347f1a59eb332f20e8522", "presubmit-am-86ce18b053454a4db98a349f8b39985e", "presubmit-am-94d3142a4e1c418fadfd6eca6208920a", "presubmit-am-a466ed1382304d549cb550a5cae804e6" into tm-dev am: a62f32758c am: 0c089a7244 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17140464

Change-Id: If4bad0b00ed13f8361c0c7efdebe467675ed4c7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 08:51:09 +00:00
Nathalie Le Clair
8f8e9baffb Merge "Allow for internal types in @hide API" into tm-dev am: cc3898c6d7 am: bdb2dafe03 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17567131

Change-Id: If7ea1350251248065564c4d49b70086395b4b013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 08:51:03 +00:00
Nathalie Le Clair
7088e64341 Merge "Allow for internal types in @hide API" into tm-dev am: cc3898c6d7 am: 142eb1b031 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17567131

Change-Id: Ib1fd482a446759ed3b5cc8cb204cd241ad7ddea9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 08:50:38 +00:00
Yan Han
be288b8f91 Merge changes from topics "presubmit-am-7ed5c317d7b347f1a59eb332f20e8522", "presubmit-am-86ce18b053454a4db98a349f8b39985e", "presubmit-am-94d3142a4e1c418fadfd6eca6208920a", "presubmit-am-a466ed1382304d549cb550a5cae804e6" into tm-dev am: a62f32758c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17140464

Change-Id: I784d4e9f8c6d28d2d2efbe3134f334fdd08235c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 08:33:01 +00:00
Yan Han
0c089a7244 Merge changes from topics "presubmit-am-7ed5c317d7b347f1a59eb332f20e8522", "presubmit-am-86ce18b053454a4db98a349f8b39985e", "presubmit-am-94d3142a4e1c418fadfd6eca6208920a", "presubmit-am-a466ed1382304d549cb550a5cae804e6" into tm-dev am: a62f32758c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17140464

Change-Id: I0171243b276c6bab410b190bde052a7e011f675d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 08:32:54 +00:00
Nathalie Le Clair
bdb2dafe03 Merge "Allow for internal types in @hide API" into tm-dev am: cc3898c6d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17567131

Change-Id: I27dfddc4541d5f47a072a41edafb7800a3c011cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 08:31:54 +00:00
Nathalie Le Clair
142eb1b031 Merge "Allow for internal types in @hide API" into tm-dev am: cc3898c6d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17567131

Change-Id: I5113e18ebfe5a586238bde2a7ddcd29e7fed0274
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 08:30:56 +00:00
Yan Han
a62f32758c Merge changes from topics "presubmit-am-7ed5c317d7b347f1a59eb332f20e8522", "presubmit-am-86ce18b053454a4db98a349f8b39985e", "presubmit-am-94d3142a4e1c418fadfd6eca6208920a", "presubmit-am-a466ed1382304d549cb550a5cae804e6" into tm-dev 
* changes:
  Add Absolute Volume Control support for a TV as the System Audio device
  Implement support for Absolute Volume Control
  Add call to onBootPhase to tests that use HdmiControlService
  Add wrapper for AudioDeviceVolumeManager in the HDMI framework
 2022-04-05 08:17:31 +00:00
Nathalie Le Clair
cc3898c6d7 Merge "Allow for internal types in @hide API" into tm-dev 2022-04-05 08:14:54 +00:00
Nishant Singh
450f0ff75c Merge "Replace PackageManagerInternal with PackageManager." into tm-dev am: 0920a8d798 am: 5d28d28345 am: c6d0583999 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17536788

Change-Id: I81eb051dbcb66fd8aed19b6cb6a41f44d2fee42d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 07:58:11 +00:00
Nishant Singh
c6d0583999 Merge "Replace PackageManagerInternal with PackageManager." into tm-dev am: 0920a8d798 am: 5d28d28345 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17536788

Change-Id: Icfcc5d22e6f82ad9cca2c15f7a85f6258f3a9cf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 07:37:20 +00:00
Nishant Singh
d70fbc2ef4 Merge "Replace PackageManagerInternal with PackageManager." into tm-dev am: 0920a8d798 am: 7b638fcf6e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17536788

Change-Id: I3a926ca6b66532934c1f5570f67b254a19ab4c37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 07:36:25 +00:00
Nishant Singh
5d28d28345 Merge "Replace PackageManagerInternal with PackageManager." into tm-dev am: 0920a8d798 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17536788

Change-Id: Ib758562df45853efa4c55fde6e6964aa50a0994b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 07:14:31 +00:00
Nishant Singh
7b638fcf6e Merge "Replace PackageManagerInternal with PackageManager." into tm-dev am: 0920a8d798 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17536788

Change-Id: I406997f513fdafe387ef1469677d8e2a3adfe4ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 07:13:29 +00:00
Nishant Singh
0920a8d798 Merge "Replace PackageManagerInternal with PackageManager." into tm-dev 2022-04-05 06:52:39 +00:00
Galia Peycheva
e18c741c95 Merge "Add edu text to TV PiP" into tm-dev am: 49f5f057b6 am: 8973dc6a65 am: 0b40de4627 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17378167

Change-Id: I834f340ca013ebbe73b8e2e407ea67f40507e3e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 06:52:08 +00:00
Galia Peycheva
d20afe052a Merge "Add Tv Pip rounded corners tray" into tm-dev am: b26603d090 am: 911b59f8b6 am: 36275ad04f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17378166

Change-Id: If88df7c9dd3b76c73dbb149166699741b843f18c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 06:51:32 +00:00
Galia Peycheva
0b40de4627 Merge "Add edu text to TV PiP" into tm-dev am: 49f5f057b6 am: 8973dc6a65 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17378167

Change-Id: I101a1b69a759462debb4c81449e3db6e9c488b8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 06:39:21 +00:00
Galia Peycheva
36275ad04f Merge "Add Tv Pip rounded corners tray" into tm-dev am: b26603d090 am: 911b59f8b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17378166

Change-Id: Ic2a06d0823fd7de977967095c6680d574c18581c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 06:39:12 +00:00
Galia Peycheva
70c767fe2f Merge "Add edu text to TV PiP" into tm-dev am: 49f5f057b6 am: 2063873041 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17378167

Change-Id: I15b3d1c637f6ae7e657bfc089c1e85afee1b6358
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 06:38:49 +00:00
Galia Peycheva
26b69aeee0 Merge "Add Tv Pip rounded corners tray" into tm-dev am: b26603d090 am: 2f77d84220 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17378166

Change-Id: I372c66d59fb9f74af4ed04b6e3b1b8e7f977566f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 06:38:06 +00:00
Jiyong Park
91dd558f42 Don't use framework and SDK at the same time 
The configuration doesn't make sense and is error-prone as the
availability of a private method in a class can change whether the class
is part of the SDK or not.

Bug: 227528906
Test: m
Change-Id: Ie2c7bd984a7dd5c9847fa130280509f947e65d84
 2022-04-05 15:29:25 +09:00
Galia Peycheva
8973dc6a65 Merge "Add edu text to TV PiP" into tm-dev am: 49f5f057b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17378167

Change-Id: Ic40326294dce56252b6d314f0d8f51af37761c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 06:19:03 +00:00
Galia Peycheva
911b59f8b6 Merge "Add Tv Pip rounded corners tray" into tm-dev am: b26603d090 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17378166

Change-Id: I9440500a86e5d8d780712685b47eefda011dfb30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 06:18:06 +00:00
Galia Peycheva
2063873041 Merge "Add edu text to TV PiP" into tm-dev am: 49f5f057b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17378167

Change-Id: Icefc4bed35df71973fbebc9e17537b8d4397ca1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 06:17:57 +00:00
Galia Peycheva
2f77d84220 Merge "Add Tv Pip rounded corners tray" into tm-dev am: b26603d090 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17378166

Change-Id: I691802739ab852481a3543094c006716f00695df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 06:17:05 +00:00
Galia Peycheva
49f5f057b6 Merge "Add edu text to TV PiP" into tm-dev 2022-04-05 06:01:26 +00:00
Galia Peycheva
b26603d090 Merge "Add Tv Pip rounded corners tray" into tm-dev 2022-04-05 05:59:14 +00:00
Joshua Mccloskey
378590dfc9 Merge "Added fade animation to udfps#enroll#error" into tm-dev am: b9159d77c1 am: 83f836fc8b am: eb6c57b0d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17545058

Change-Id: Ia9cd2b4ce5469285b4c800f61e7a6276ffe90ec9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 04:18:19 +00:00
Joshua Mccloskey
eb6c57b0d8 Merge "Added fade animation to udfps#enroll#error" into tm-dev am: b9159d77c1 am: 83f836fc8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17545058

Change-Id: I5faaa7e82056a72a3d13aab3f51b3b88243e9d69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 03:57:00 +00:00
Joshua Mccloskey
a272615fda Merge "Added fade animation to udfps#enroll#error" into tm-dev am: b9159d77c1 am: 654cf0df54 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17545058

Change-Id: I9f0391bd7762ef205b6d7ae04b961ad5290ff4c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 03:56:20 +00:00
Joshua Mccloskey
83f836fc8b Merge "Added fade animation to udfps#enroll#error" into tm-dev am: b9159d77c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17545058

Change-Id: I51499da1b43e5db918d3b4e9a80c8abf54657977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 03:25:14 +00:00