Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
638,699 Commits 3 Branches 0 Tags
4e408fe1832b0856de212db9f33a3bb64bd6ea96
Commit Graph

638699 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Wickham
4e408fe183 Fixes Studio warning from not being able to find this reference. 
Test: Manual
Fixes: 186905222
Change-Id: Iab122016da87dc151d3928666bea9d235691fb67
 2021-05-01 01:01:57 +00:00
TreeHugger Robot
51cac482f5 Merge "Update documentation for activity flags." into sc-dev 2021-04-29 08:48:15 +00:00
Alex Johnston
412667ddaf Merge "Disable security and network logging COPE" into sc-dev 2021-04-29 08:04:23 +00:00
SongFerng Wang
09ca8113f5 Merge "Add CAPABILITY_PHYSICAL_CHANNEL_CONFIG_1_6_SUPPORTED" into sc-dev 2021-04-29 07:15:25 +00:00
Tianjie Xu
285e375408 Merge changes Ia43ab0ab,I0c4b91aa am: 474d549f7c am: 38762c75d1 am: af1f784ee0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690266

Change-Id: I0155ccab9da75bf5b5f34825a21003545219b512
 2021-04-29 06:31:41 +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
Treehugger Robot
8215d0e109 [automerger skipped] Merge "Rename getAllNetworkStateSnapshot which should be pluralized" am: d1473b36d6 am: 4ed0a5060a am: 97a9cfb605 -s ours 
am skip reason: Merged-In Ic18d17d05984fa2466c962c7843c0ef7183ce77c with SHA-1 402b1fd272 is already in history

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

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

Change-Id: Ica36f177bcb4a1d6625a0bf14288f6acd3ea4224
 2021-04-29 05:44:56 +00:00
Kyunglyul Hyun
b82f38cf3e Merge "Clean up Session2Record in MCS" into sc-dev 2021-04-29 05:37:00 +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
Yi Kong
0ac12528fe Merge "profcollect: alternative property to start profcollectd" am: 67bea71a2f am: f965ffe0e2 am: a9a873f0a9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689805

Change-Id: Ic38016ae401d7b1852e178d792da209ac7983f3a
 2021-04-29 05:21:15 +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
Cecilia Hong
5b0e5143b3 Merge "Skip showing the Smartspace recommendation card if it's an empty update." into sc-dev 2021-04-29 04:55:29 +00:00
TreeHugger Robot
2ac5334517 Merge "Add unit test init method." into sc-dev 2021-04-29 04:53:40 +00:00
Bill Lin
9df0e2bdb3 Merge "1/ Add ONE_HANDED_MODE_ACTIVATED secure settings for shortcut" into sc-dev 2021-04-29 04:49:42 +00:00
TreeHugger Robot
f38abb5943 Merge "Add traces in ViewRootImpl handler" into sc-dev 2021-04-29 04:49:10 +00:00
Treehugger Robot
d1473b36d6 Merge "Rename getAllNetworkStateSnapshot which should be pluralized" 2021-04-29 04:40:51 +00:00
Riddle Hsu
3d4a4d7510 Merge "Disable fixed rotation for starting window with ime surface" into sc-dev 2021-04-29 04:39:44 +00:00
Benedict Wong
c6fe30068d Merge "Update set|getRetryIntervalsMs to Millis" 2021-04-29 04:35:45 +00:00
Svetoslav Ganov
e8b84a6e00 Merge "Remap per app id for AR/location sources" into sc-dev 2021-04-29 04:26:06 +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
Zhen Zhang
f7857d0b6d Merge "Log user level App Hibernation related atoms" into sc-dev 2021-04-29 04:20:12 +00:00
Yi Kong
67bea71a2f Merge "profcollect: alternative property to start profcollectd" 2021-04-29 04:02:10 +00:00
Treehugger Robot
0ff06379e8 Merge "[Telephony] Remove getChannelNumber from SDK" am: cadc1f6086 am: b5dfa219ba am: 7c32a3f599 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687486

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

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

Change-Id: I880d3c0b73e5ea3b0f55589c554ebf6fc3ab1d98
 2021-04-29 03:37:11 +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
Aaron Huang
1d1ff6fb3e Merge "Rename *Iface* APIs to *Interface*" into sc-dev 2021-04-29 03:32:16 +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
Aemon Cannon
01d1a375ba Merge "Add instrumented app to JAR path (isolated splits)" into qt-qpr1-dev am: d2317d0fac am: 9769b95c31 am: 08862bc2fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14240125

Change-Id: I99f2ef8b1bce9da552dbee816055509b4e04a688
 2021-04-29 03:01:16 +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
PETER LIANG
cf2da13db3 Merge "Revise the character limit of the string." into sc-dev 2021-04-29 02:51:30 +00:00
Rhed Jao
a659ad825f Merge "Fix missing the implementation of Computer#dump() in ComputerLocked" into sc-dev 2021-04-29 02:42:36 +00:00
Wei Sheng Shih
d79399ba3f Merge "Only add one starting window for a task when unlock." into sc-dev 2021-04-29 02:22:18 +00:00
Treehugger Robot
cadc1f6086 Merge "[Telephony] Remove getChannelNumber from SDK" 2021-04-29 01:20:15 +00:00
TreeHugger Robot
f941b5a2f4 Merge "Recording alarm removal reasons for debugging" into sc-dev 2021-04-29 01:14:40 +00:00
TreeHugger Robot
091549478c Merge "Synchronize native ApkAssets data" into sc-dev 2021-04-29 01:11:03 +00:00
Chris Li
328079de27 Merge "Determine whether to support activities in multi window (1/n)" into sc-dev 2021-04-29 01:09:53 +00:00
Treehugger Robot
1084a81a68 Merge "Internal graphics package owners" 2021-04-29 00:55:03 +00:00
Yohei Yukawa
c09a657113 Merge "Make IInputMethodPrivilegedOperations to async (5/N)" into sc-dev 2021-04-29 00:45:17 +00:00
TreeHugger Robot
7c9d3192de Merge "Fix stale EditorInfo upon EditText#setText()" into sc-dev 2021-04-29 00:42:23 +00:00
Aemon Cannon
08862bc2fc 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: Iafbcfb8bf9abb1a6eb7141010848258c06d4d10a
 2021-04-29 00:15:25 +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