Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
617,573 Commits 3 Branches 0 Tags
22dbd0413ff025b3f14eb3557355ab249e6d388e
Commit Graph

617573 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ashwini Oruganti
22dbd0413f Expose FLAG_MUTABLE_UNAUDITED for use by CTS 
Bug: 160794467
Test: manual
Change-Id: Ib475c8facd914b2278d73cbeb6578e634c0c3476
 2021-01-07 13:32:48 -08:00
Hui Yu
38b7cd2db5 Merge "BG-FGS-Launch uses the same grace period mechanism as BG-Activity-Launch." 2021-01-07 18:47:24 +00:00
Ying Xu
8824d2d9f5 Merge "Fetch the WiFiInfo from NetworkCapabilities" 2021-01-07 18:20:25 +00:00
Evan Rosky
c08017775a Merge "Add per-change flags and wallpaper windows to transitions" 2021-01-07 18:15:56 +00:00
Treehugger Robot
1557e2bf14 Merge "MTP: Update language to comply with Android's inclusive language guidance" am: 86b6f66d9f am: 5e5716ef83 am: 27f9f37c0b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382396

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If5df055458ced225b8c6d3046617a7dd620d590e
 2021-01-07 17:54:17 +00:00
Jeff Sharkey
0eed8e43af Merge "Update owner for ConnectivityServiceInitializer.java" am: 6e01e06579 am: a9b833b55c am: 16a8431f5c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540909

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic264c3d6085fd63feed31ecc0de0fe7a5781e853
 2021-01-07 17:53:47 +00:00
Jeff Sharkey
7bdb59ff90 Merge "update owners for shortcut and launcher related files" am: 6173852165 am: 8d21688681 am: 82d5729a4b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540651

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9489078072612dcc541de5acf570eb22519042b0
 2021-01-07 17:53:22 +00:00
Andrei-Valentin Onea
04f02686b8 Merge changes from topic "preinstall-overrides" am: 29ed176b46 am: d1ebbf5086 am: dd1d1cbacc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520701

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifbdca1201aa118e59b45f7dd89441a210fc2fa9c
 2021-01-07 17:52:57 +00:00
Adrian Roos
c16bde6c5e Merge "Add inputmethod coretests OWNERS" am: 169c132627 am: 0bb2d26a15 am: 73e293134d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541540

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I944ee662b87df8d9071c3aec3b8474a2c236d04a
 2021-01-07 17:52:25 +00:00
Vishnu Nair
353bade564 Merge "Enable blast adapater for SurfaceView" 2021-01-07 17:51:52 +00:00
Treehugger Robot
27f9f37c0b Merge "MTP: Update language to comply with Android's inclusive language guidance" am: 86b6f66d9f am: 5e5716ef83 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382396

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id177580f106509fab9ec6e706ed9a80b11dd16dc
 2021-01-07 17:45:06 +00:00
Jayant Chowdhary
00336bac7f Merge "camera2 docs: fix CONTROL_AWB_MODE documentation." 2021-01-07 17:37:39 +00:00
Treehugger Robot
5e5716ef83 Merge "MTP: Update language to comply with Android's inclusive language guidance" am: 86b6f66d9f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382396

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf8efbd06b6839f8922cc2415e1d13ddc0769b25
 2021-01-07 17:36:04 +00:00
Jeff Sharkey
16a8431f5c Merge "Update owner for ConnectivityServiceInitializer.java" am: 6e01e06579 am: a9b833b55c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540909

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic44f1fd28d0564848a97370262f9511ea85285a1
 2021-01-07 17:35:58 +00:00
Jeff Sharkey
82d5729a4b Merge "update owners for shortcut and launcher related files" am: 6173852165 am: 8d21688681 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540651

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie0d9564ead4ed0f689cfbbc8e80425d4a8447500
 2021-01-07 17:35:45 +00:00
Andrei-Valentin Onea
dd1d1cbacc Merge changes from topic "preinstall-overrides" am: 29ed176b46 am: d1ebbf5086 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520701

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I94c9aca60ff8d5eec190434a2a22338cb04d5922
 2021-01-07 17:35:17 +00:00
Adrian Roos
73e293134d Merge "Add inputmethod coretests OWNERS" am: 169c132627 am: 0bb2d26a15 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541540

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e81ecbabbc8cc3a421019f492bccf913f68eafd
 2021-01-07 17:34:54 +00:00
Alec Mouri
1f31bfadba Merge "Check if mGrContext exists when requiring a vk context." 2021-01-07 17:32:20 +00:00
Jeff Sharkey
a9b833b55c Merge "Update owner for ConnectivityServiceInitializer.java" am: 6e01e06579 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540909

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5edb4e96c73a926c887dfdf31f9ee7a555db19c1
 2021-01-07 17:29:06 +00:00
Eugene Susla
b0de403aa9 Merge "Introduce API to get CDM profile permissions description string" 2021-01-07 17:21:27 +00:00
Jeff Sharkey
8d21688681 Merge "update owners for shortcut and launcher related files" am: 6173852165 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540651

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2bdceac47bfb1c12b70af5dfcbb21176a297e0d8
 2021-01-07 17:21:12 +00:00
Andrei-Valentin Onea
d1ebbf5086 Merge changes from topic "preinstall-overrides" am: 29ed176b46 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520701

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I916e47454ada9ffe6b0eba017807baa8d904ea44
 2021-01-07 17:15:02 +00:00
Adrian Roos
0bb2d26a15 Merge "Add inputmethod coretests OWNERS" am: 169c132627 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541540

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I981c850671481925250a9d0420fe9342e5bce25b
 2021-01-07 17:08:54 +00:00
Yan Zhu
4d8a62eafb Merge "New DevicePolicyManager operations with safety checker for device and package management" 2021-01-07 16:50:05 +00:00
Treehugger Robot
86b6f66d9f Merge "MTP: Update language to comply with Android's inclusive language guidance" 2021-01-07 15:23:53 +00:00
Jeff Sharkey
6e01e06579 Merge "Update owner for ConnectivityServiceInitializer.java" 2021-01-07 14:55:01 +00:00
Jeff Sharkey
6173852165 Merge "update owners for shortcut and launcher related files" 2021-01-07 14:50:03 +00:00
Andrei-Valentin Onea
29ed176b46 Merge changes from topic "preinstall-overrides" 
* changes:
  Add force_non_debuggable_final_build_for_compat
  Allow overriding compat config prior to install time.
 2021-01-07 14:04:12 +00:00
Rhed Jao
f949e8aef9 Merge "Fix missing fields when parceling the BugreportInfo" am: 2042ea04aa am: 77d5168388 am: ffcba92063 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540911

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa5d63a7d7951bb9fcf337e859df786688ac2c6a
 2021-01-07 13:58:51 +00:00
Adrian Roos
169c132627 Merge "Add inputmethod coretests OWNERS" 2021-01-07 13:46:17 +00:00
Adrian Roos
44695952c6 Add inputmethod coretests OWNERS 
Test: n/a
Change-Id: If240716ddb0aa99111f8e343fca36a5bd97ed0dc
 2021-01-07 14:44:07 +01:00
Neil Fuller
73338733e6 Merge "Move "API" constants to API classes" 2021-01-07 13:38:46 +00:00
Rhed Jao
ffcba92063 Merge "Fix missing fields when parceling the BugreportInfo" am: 2042ea04aa am: 77d5168388 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540911

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I761e172a053d380ab68728236a2871af4e1876fe
 2021-01-07 13:17:00 +00:00
Rhed Jao
77d5168388 Merge "Fix missing fields when parceling the BugreportInfo" am: 2042ea04aa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540911

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie13f6cd42b403293df52448df9a5a7f0e90f4c2c
 2021-01-07 12:45:12 +00:00
Treehugger Robot
0260912d35 Merge "Stop using BaseNetdEventListener in ConnectivityService." am: 883c34a45d am: 90c612a9b1 am: 276ffb6422 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541209

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ed42aae7377fe09399961ff40e03b83e5ce2f6f
 2021-01-07 12:27:22 +00:00
Mathew Inwood
55350450fb Merge "Derestrict ContextWrapper.createApplicationContext." am: 6e1f2d209b am: 4b46fb6b09 am: f1f8f956c6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541664

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If47397df98ebb90c079d110fbfd947aa17abe05b
 2021-01-07 12:26:58 +00:00
Mathew Inwood
7840d20929 Merge "Derestrict mSurfaceTexture, mProducer." am: 8e6ce38bde am: c1dbf374d0 am: 83b6163810 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iea731e7ccdea5bc8618bbed1e206f9a07b2a6e3c
 2021-01-07 12:26:28 +00:00
Rhed Jao
2042ea04aa Merge "Fix missing fields when parceling the BugreportInfo" 2021-01-07 12:05:46 +00:00
TreeHugger Robot
db806b58cf Merge "Add a UI Context for RootTaskDisplayAreaOrganizer" 2021-01-07 11:58:04 +00:00
Treehugger Robot
276ffb6422 Merge "Stop using BaseNetdEventListener in ConnectivityService." am: 883c34a45d am: 90c612a9b1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541209

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14f7ce15ba13a96ed070370fe75b73010352a415
 2021-01-07 11:54:59 +00:00
Terry Wang
a7b4121e0b Merge "Update Framework from Jetpack." 2021-01-07 11:49:00 +00:00
Mathew Inwood
f1f8f956c6 Merge "Derestrict ContextWrapper.createApplicationContext." am: 6e1f2d209b am: 4b46fb6b09 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541664

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If11ea65e77e954293a8474a32ef09ad09a8fb63e
 2021-01-07 11:47:46 +00:00
Mathew Inwood
83b6163810 Merge "Derestrict mSurfaceTexture, mProducer." am: 8e6ce38bde am: c1dbf374d0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie3321c80292eada053fa4ef3319d9d3555fee3e6
 2021-01-07 11:47:32 +00:00
Treehugger Robot
90c612a9b1 Merge "Stop using BaseNetdEventListener in ConnectivityService." am: 883c34a45d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541209

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5ec30116a0bea9a2739ddeee61af5374fc536c1f
 2021-01-07 11:47:24 +00:00
Mathew Inwood
4b46fb6b09 Merge "Derestrict ContextWrapper.createApplicationContext." am: 6e1f2d209b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541664

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I59bdd1f9ce9ff65bd2b2fd4007b356116538fd65
 2021-01-07 11:42:11 +00:00
Mathew Inwood
c1dbf374d0 Merge "Derestrict mSurfaceTexture, mProducer." am: 8e6ce38bde 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If7aa83bba5e3f06d94dec1b3eb767fc0d4cdd812
 2021-01-07 11:20:46 +00:00
TreeHugger Robot
4a34d3ba08 Merge "Move Settings preferenceCategory style into SettingsTheme" 2021-01-07 11:20:36 +00:00
Mathew Inwood
2702a6662d Merge "Derestrict RippleDrawable.mState." am: b698722956 am: f11b14dfe0 am: 6d1ff42ee6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541666

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I370ce36e69b1daf56762eb2184ff780ff77e862b
 2021-01-07 11:12:55 +00:00
Mathew Inwood
46a446f45e Merge "Derestrict Resources.getDisplayAdjustments()." am: ea01ff86d0 am: e48c5194db am: 37c7d893b1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541667

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic62efe2198ec8b30b509aed5821b13822f81273f
 2021-01-07 11:12:18 +00:00
Treehugger Robot
883c34a45d Merge "Stop using BaseNetdEventListener in ConnectivityService." 2021-01-07 10:58:03 +00:00