Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
646,379 Commits 3 Branches 0 Tags
e435403fbdfd2b42baf04035ec8821a08f7c6645
Commit Graph

646379 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Huang
e435403fbd Add additional doc for SatellitePvt 
Bug: 183239007
Test: atest CtsLocationPrivilegedTestCases
Change-Id: I30a0ff67c2523ab08505c2761594b64f48c23a21
 2021-04-29 18:06:19 +08:00
Bowgo Tsai
dbec8c1a96 Merge "Revert "[SettingsProvider] Remove @Readable for NFC_PAYMENT_DEFA..."" into sc-dev am: d5b4a59bc0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14341152

Change-Id: Ic69acb91e2c97373ce6314c10186c4984384d75d
 2021-04-29 09:30:55 +00:00
Treehugger Robot
0b373aa359 [automerger skipped] Merge "Add getters to UnderlyingNetworkInfo" am: e2e8b9ce88 am: b2551d4cc9 am: 2d96bac3aa -s ours am: 16897d63f2 -s ours 
am skip reason: Merged-In Id59744097208d91298a25ef110ade91a9cf291a1 with SHA-1 f6008978c4 is already in history

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

Change-Id: Ia66f851af83f562565faa33cb3fef18ed5bf6e32
 2021-04-29 09:30:38 +00:00
Bowgo Tsai
d5b4a59bc0 Merge "Revert "[SettingsProvider] Remove @Readable for NFC_PAYMENT_DEFA..."" into sc-dev 2021-04-29 09:29:50 +00:00
Treehugger Robot
16897d63f2 [automerger skipped] Merge "Add getters to UnderlyingNetworkInfo" am: e2e8b9ce88 am: b2551d4cc9 am: 2d96bac3aa -s ours 
am skip reason: Merged-In Id59744097208d91298a25ef110ade91a9cf291a1 with SHA-1 f6008978c4 is already in history

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

Change-Id: I9ac1f63c16debb8269b240380257bffd934021d1
 2021-04-29 09:23:49 +00:00
Michał Brzeziński
44b0332608 Merge "Removing unnecessary QuickSettings clip bounds in split shade" into sc-dev am: 4380046455 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14341203

Change-Id: I656177f09fe6658f33477d7db21a9675e8ab57e6
 2021-04-29 09:15:45 +00:00
Martijn Coenen
fa4c9a7044 Merge "Revert "Revert "Fixup app-private dirs that are not writable.""" into sc-dev am: 166400b045 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14327561

Change-Id: I66952550bce3a6ae9dcc673fd3410822aaeb944f
 2021-04-29 09:15:27 +00:00
Alina Zaidi
cdf8a2c16f Merge "Change background color of work widgets, for when work profile is off." into sc-dev am: 0a33298578 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14327559

Change-Id: I4c85c51f50c852888f07fad94de4f654f0b49ab6
 2021-04-29 09:15:04 +00:00
Michał Brzeziński
4380046455 Merge "Removing unnecessary QuickSettings clip bounds in split shade" into sc-dev 2021-04-29 09:14:41 +00:00
Martijn Coenen
166400b045 Merge "Revert "Revert "Fixup app-private dirs that are not writable.""" into sc-dev 2021-04-29 09:02:45 +00:00
Treehugger Robot
2d96bac3aa Merge "Add getters to UnderlyingNetworkInfo" am: e2e8b9ce88 am: b2551d4cc9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684651

Change-Id: I33d2bbca5a72ab8500a7886073c9f4c4d1b84925
 2021-04-29 08:57:50 +00:00
Alina Zaidi
0a33298578 Merge "Change background color of work widgets, for when work profile is off." into sc-dev 2021-04-29 08:57:45 +00:00
TreeHugger Robot
e31344c371 Merge "Update documentation for activity flags." into sc-dev am: 51cac482f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14308715

Change-Id: I75c53fb20d3c3a0443441dd4629cf44714e27954
 2021-04-29 08:51:05 +00:00
Alex Johnston
6f5e7a0613 Merge "Disable security and network logging COPE" into sc-dev am: 412667ddaf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14327552

Change-Id: I12b6b5d9508a6b265ed004971d2c24e1f3f21825
 2021-04-29 08:50:39 +00:00
TreeHugger Robot
51cac482f5 Merge "Update documentation for activity flags." into sc-dev 2021-04-29 08:48:15 +00:00
Treehugger Robot
b2551d4cc9 Merge "Add getters to UnderlyingNetworkInfo" am: e2e8b9ce88 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684651

Change-Id: I97222bb04bdea78178741245016658cad7f082dc
 2021-04-29 08:16:36 +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
515653b4a3 Merge "Add CAPABILITY_PHYSICAL_CHANNEL_CONFIG_1_6_SUPPORTED" into sc-dev am: 09ca8113f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14254545

Change-Id: Iba7b5c7da5e93341b8f8a85dfc1fecf673fb5ce6
 2021-04-29 07:53:48 +00:00
Bowgo Tsai
42c0359ff4 Revert "[SettingsProvider] Remove @Readable for NFC_PAYMENT_DEFA..." 
Revert "Add an exception for Settings.Secure.NFC_PAYMENT_DEFAULT..."

Revert submission 14326766-b/174151290

Reason for revert: potential test error for b/186717555
Reverted Changes:
I97fcd5550:[SettingsProvider] Remove @Readable for NFC_PAYMEN...
I6e55bef75:Add an exception for Settings.Secure.NFC_PAYMENT_D...

Bug: 186717555
Bug: 182283321
Bug: 174151290
Change-Id: Ib84c57b855ffe10870fda2568a7499746f0d2335
 2021-04-29 07:44:33 +00:00
Treehugger Robot
e2e8b9ce88 Merge "Add getters to UnderlyingNetworkInfo" 2021-04-29 07:29:08 +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
03334eae56 Merge changes Ia43ab0ab,I0c4b91aa am: 474d549f7c am: 38762c75d1 am: af1f784ee0 am: 285e375408 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690266

Change-Id: I8de7a87f596754c4cbb27179820b427f5ac75a7c
 2021-04-29 06:44:35 +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
c32de5a0d1 [automerger skipped] Merge "Rename getAllNetworkStateSnapshot which should be pluralized" am: d1473b36d6 am: 4ed0a5060a am: 97a9cfb605 -s ours am: 8215d0e109 -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: Ic6c1847c331b21f17fecb6a4b3d82691c958d1ea
 2021-04-29 05:51:06 +00:00
Benedict Wong
150a236088 Merge "Update set|getRetryIntervalsMs to Millis" am: c6fe30068d am: 058149884f am: 33d2807b02 am: 795d43d31d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688783

Change-Id: Ibfc92f1a2f282fc679bf404f9194fbca53478611
 2021-04-29 05:50:14 +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
d1b0047de4 Merge "Clean up Session2Record in MCS" into sc-dev am: b82f38cf3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14233537

Change-Id: Id9efcd0bec45dfae32bdba70595a88c1af45e3c8
 2021-04-29 05:42:50 +00:00
Yi Kong
28138e54dc Merge "profcollect: alternative property to start profcollectd" am: 67bea71a2f am: f965ffe0e2 am: a9a873f0a9 am: 0ac12528fe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689805

Change-Id: Iee6cbe30b4b2adb1a39c6d8d0e83ac302a2c1147
 2021-04-29 05:42:18 +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
f8214e0320 Merge "Skip showing the Smartspace recommendation card if it's an empty update." into sc-dev am: 5b0e5143b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14334416

Change-Id: I32eaaacbc7d82bf130065e347f10a027861eae14
 2021-04-29 04:57:31 +00:00
TreeHugger Robot
d5389f7693 Merge "Add unit test init method." into sc-dev am: 2ac5334517 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14104240

Change-Id: Ief57e5180a3d2f46f8962b157e4be3beab9abcb6
 2021-04-29 04:56:47 +00:00
Bill Lin
eb4eb29fba Merge "1/ Add ONE_HANDED_MODE_ACTIVATED secure settings for shortcut" into sc-dev am: 9df0e2bdb3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14295085

Change-Id: I5b5a262b31691d3ed970562b17234c6947a52e73
 2021-04-29 04:56:06 +00:00
TreeHugger Robot
beb4732467 Merge "Add traces in ViewRootImpl handler" into sc-dev am: f38abb5943 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14214594

Change-Id: I18097aa4bab820e35fbc8fe4cbd7d6f97da489e4
 2021-04-29 04:55:52 +00:00
Riddle Hsu
e8ca4c8490 Merge "Disable fixed rotation for starting window with ime surface" into sc-dev am: 3d4a4d7510 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14340325

Change-Id: I65a188655aaa37427799650f2e2473814ccc4a9e
 2021-04-29 04:55:33 +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
Svetoslav Ganov
223407b141 Merge "Remap per app id for AR/location sources" into sc-dev am: e8b84a6e00 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14343273

Change-Id: I20ca4b80106230dd90c78664f52d3c8f47758325
 2021-04-29 04:55:02 +00:00
Zhen Zhang
20778ffddb Merge "Log user level App Hibernation related atoms" into sc-dev am: f7857d0b6d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14274121

Change-Id: Ifc895bcf57a8c189a761b11c13c9d30554d5eabd
 2021-04-29 04:54:07 +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