Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
571,473 Commits 3 Branches 0 Tags
9b7bccc2cff64faaa5e9fc13e8bc2833fa05bf2f
Commit Graph

571473 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Meng Wang
9b7bccc2cf Merge "Lazily load bitmap of SubscriptionInfo" am: 4d8663cb84 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1778879

Change-Id: I6dbb148d3cee85851b63c54c9c193e50223abe68
 2021-07-27 18:53:20 +00:00
Meng Wang
4d8663cb84 Merge "Lazily load bitmap of SubscriptionInfo" 2021-07-27 18:30:21 +00:00
Meng Wang
ba8227eb45 Lazily load bitmap of SubscriptionInfo 
Bug: 194251398
Test: manual - see the bug
Change-Id: I0af239e1befeff8d4f00a27bc9679eb0b4849500
Merged-In: I0af239e1befeff8d4f00a27bc9679eb0b4849500
(cherry picked from commit 0e0a12ccf3)
 2021-07-26 21:06:33 -07:00
Tianjie Xu
7c7696cd47 Merge "Add a system API UpdateEngine to switch the slot back and forth" am: 4eaa49eeb6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1698090

Change-Id: I60bdebcc482028135dd05979bb50cba5ca656f13
 2021-07-27 02:19:18 +00:00
Tianjie Xu
4eaa49eeb6 Merge "Add a system API UpdateEngine to switch the slot back and forth" 2021-07-27 02:03:10 +00:00
Lucas Dupin
dbb3825a04 Merge "Update boot animation owners" am: 103308ad5d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1766280

Change-Id: Id7775bfeb7ebc1cae218f69435b5ff38654bb6da
 2021-07-26 22:17:18 +00:00
Lucas Dupin
103308ad5d Merge "Update boot animation owners" 2021-07-26 22:05:17 +00:00
Tianjie Xu
254fd31028 Merge "Add owner file for UpdateEngine" am: 5c8dce3ada 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1776894

Change-Id: I55b82fe8a847e94cca9769afbf29ec24cd46a988
 2021-07-26 21:33:14 +00:00
Tianjie Xu
5c8dce3ada Merge "Add owner file for UpdateEngine" 2021-07-26 21:14:06 +00:00
Lucas Dupin
273227d1ac Update boot animation owners 
Test: none
Bug: 190093578
Change-Id: Id83d1ff6bbec63ec94402260a29c3ddcbf0ae414
 2021-07-26 18:59:27 +00:00
Suren Baghdasaryan
656efc7acb Merge "ActivityManagerService: report current and max thrashing levels" am: 9af29add1f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1776886

Change-Id: I4733097d5907376725c10adf219a36d48f8a908d
 2021-07-26 18:03:08 +00:00
Suren Baghdasaryan
9af29add1f Merge "ActivityManagerService: report current and max thrashing levels" 2021-07-26 17:47:59 +00:00
Treehugger Robot
5f525b6ec2 Merge "Mark classes as final that have final destructors" am: eb7dfa2f5f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1774946

Change-Id: Ida169ef83d2aaf5f51a47ea3245cbe9e642f9626
 2021-07-26 17:06:35 +00:00
Treehugger Robot
eb7dfa2f5f Merge "Mark classes as final that have final destructors" 2021-07-26 16:52:08 +00:00
Tianjie
dcbd9ea138 Add owner file for UpdateEngine 
Test: th
Change-Id: I50c775874cb9ad54f049e415b6fb68ec29d7f1c8
 2021-07-23 17:15:43 -07:00
Benedict Wong
9ddc8bfd13 Merge "Shorten safe mode timer in VCN test mode" am: 3923c3acc6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1776967

Change-Id: If504d10f34d8f2a3f7c49e01c712cc6e331c962c
 2021-07-23 23:46:18 +00:00
Benedict Wong
3923c3acc6 Merge "Shorten safe mode timer in VCN test mode" 2021-07-23 23:25:46 +00:00
Benedict Wong
5985f02af9 Shorten safe mode timer in VCN test mode 
This change reduces the time required to test VCN safe mode in CTS, in
order to meet the 30s CTS quality bar

Bug: 193482882
Test: atest --iterations 10 android.net.vcn.cts.VcnManagerTest
Original-Change: googleplex-android-review.git.corp.google.com/15375749
Change-Id: Ibbf7132d45a7a0e5554b74fda6b3e309ee2d9c44
Merged-In: Ibbf7132d45a7a0e5554b74fda6b3e309ee2d9c44
 2021-07-23 21:35:10 +00:00
Suren Baghdasaryan
ee9cea7f92 ActivityManagerService: report current and max thrashing levels 
Add thrashing and maxThrashing fields in LMK_KILL_OCCURRED report.

Bug: 194433891
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I016d95a9b2ba4b6f4ca814be1456cec59f4834da
Merged-In: I016d95a9b2ba4b6f4ca814be1456cec59f4834da
 2021-07-23 12:08:35 -07:00
Liz Kammer
a4ddfbe33b Mark classes as final that have final destructors 
Having a final destructor prevents the class from being inherited from,
adding the designation final to the class makes this behavior more
explicit. This is required to re-enable the error for
-Wno-final-dtor-non-final-class.

Test: m
Merged-In: Ia3126d30e19edfd17f7c8da368e9763ca5501e84
Change-Id: Id1d7c607af9cca0109e1f763052894cf179f4af1
 2021-07-23 17:21:11 +00:00
Treehugger Robot
9396b7d366 Merge "OWNERS file entry for config_user_types.xml" am: dc425aefbc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1773282

Change-Id: Ib5bc6f837a6ad8c72a54f6fc075e456281021667
 2021-07-22 21:28:23 +00:00
Treehugger Robot
dc425aefbc Merge "OWNERS file entry for config_user_types.xml" 2021-07-22 21:06:21 +00:00
Adam Bookatz
f73c7a2c50 OWNERS file entry for config_user_types.xml 
Change-Id: Ib1e9721a35be96a84f3b83421ba96f4d7c903c13
Test: N/A
 2021-07-22 17:28:45 +00:00
Treehugger Robot
f1d41d96cb Merge "Add OWNERS" am: c2a7a9e5f5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1773688

Change-Id: I1c5d739be492c52fd83fb900534a36039ae885e7
 2021-07-22 13:19:39 +00:00
Treehugger Robot
c2a7a9e5f5 Merge "Add OWNERS" 2021-07-22 12:57:47 +00:00
Weng Su
c3485a654c Add OWNERS 
- Add OWNERS file to /frameworks/base/packages/SettingsLib/tests/robotests/ folder

- Do not guard tests - everyone is welcomed to contribute to tests.

Change-Id: I0310fc95a5116eed97428d2efb9da1e19d234f84
Test: N/A, just owners update
 2021-07-22 10:12:29 +00:00
SongFerng Wang
2df532c092 Merge changes from topics "ApiReview_DEVICE_NR_CAPABILITY", "getPhoneCapability" am: 8c19236f8f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1772928

Change-Id: I99b79a6553669bd1cb616bbadb73ae8411f243be
 2021-07-22 06:42:25 +00:00
SongFerngWang
6e9777bb5f Add getPhoneCapability function in TelephonyManager am: 0c13fd19ec 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1772925

Change-Id: Id271be30010e05e227bd3ae5270dd8c764d8cfb9
 2021-07-22 06:42:18 +00:00
SongFerng Wang
8c19236f8f Merge changes from topics "ApiReview_DEVICE_NR_CAPABILITY", "getPhoneCapability" 
* changes:
  Changing DEVICE_NR_CAPABILITY type and renaming getMaxActiveInternetData
  Add getPhoneCapability function in TelephonyManager
 2021-07-22 06:15:05 +00:00
Treehugger Robot
5afd176d2d Merge "Unify the mismatch in the byte order of the address." am: 265e8cf670 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1771607

Change-Id: I94e479b33d8267be4e01e8de4cb5b5c282709bee
 2021-07-21 17:51:08 +00:00
Treehugger Robot
265e8cf670 Merge "Unify the mismatch in the byte order of the address." 2021-07-21 17:31:11 +00:00
Treehugger Robot
09adeddd2a [automerger skipped] Merge "Revert "Add systrace tag for system property"" am: 00e6e9cd26 -s ours 
am skip reason: Merged-In Id78992d238a73257bb9b80bfaa6bbfeb16f477d8 with SHA-1 7dc8bf4acf is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1403551

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

Change-Id: Ic750825ce2924d6ce85281da1ccad5005d9e0507
 2021-07-21 11:56:23 +00:00
Treehugger Robot
00e6e9cd26 Merge "Revert "Add systrace tag for system property"" 2021-07-21 11:43:39 +00:00
Treehugger Robot
c7c73d4ee1 Merge "profcollect: Add verbose logging for ota status updates" am: ac418218f8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1773825

Change-Id: I770aa3108932c27e83f113e37e3e6623d0b5954c
 2021-07-21 09:22:47 +00:00
Treehugger Robot
ac418218f8 Merge "profcollect: Add verbose logging for ota status updates" 2021-07-21 09:07:02 +00:00
Yi Kong
d316cc49ae profcollect: Add verbose logging for ota status updates 
Test: presubmit
Bug: 178561556
Change-Id: I4cd6b9bdb15fec4e115fefbef69c0c1e687d2392
 2021-07-21 07:32:58 +00:00
Benedict Wong
697971f693 Merge "Set TRANSPORT_PRIMARY for VCN NetworkOffers and NetworkAgents" am: d92daec786 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1772025

Change-Id: I53e05e622e1d89dd70798855eee79ceb67c1edaf
 2021-07-21 01:48:06 +00:00
Benedict Wong
d92daec786 Merge "Set TRANSPORT_PRIMARY for VCN NetworkOffers and NetworkAgents" 2021-07-21 01:29:25 +00:00
Bowgo Tsai
1241c9b6f2 Revert "Add systrace tag for system property" 
Revert "Add systrace tag for system property"

Revert "Adding system property tracing"

Revert submission 1403568-sysprop_trace

Reason for revert: makes property get/set non-reentrant
Reverted Changes:
I6f85f3f52:Add systrace tag for system property
Id2b93acb2:Adding system property tracing
Id78992d23:Add systrace tag for system property
I1ba9fc7bd:Add systrace tag for system property

Bug: 193050299
Change-Id: Iaf522b403e51abcf1d49804f35a184b4aa0d3209
Merged-In: Iaf522b403e51abcf1d49804f35a184b4aa0d3209
Test: build and boot a device
(cherry picked from commit 137d78bb67)
 2021-07-21 09:24:29 +08:00
Benedict Wong
8d6f7c7280 Set TRANSPORT_PRIMARY for VCN NetworkOffers and NetworkAgents 
This change sets TRANSPORT_PRIMARY for all NetworkScore objects passed
to ConnectivityService by the VCN. Without this patch, a VCN in safe
mode will never get any NetworkRequests, since the new Policy-based
NetworkRanker always prioritizes a existing satisfier of a network,
regardless of score. However, a higher-priority policy check ensures
that a TRANSPORT_PRIMARY request is used if it exists. This changes the
VCN to utilize that functionality.

Bug: 194122634
Test: atest FrameworksVcnTests
Change-Id: I3a298a6c4c594c6e224f3f05764614802c00e9b0
 2021-07-21 00:44:19 +00:00
Jooyung Han
f92201554a Merge "ZipUtils: use FileChannel#size" am: d0798d7117 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1765685

Change-Id: Id80acd731bdd74a8ec99273261091cacb449c4d6
 2021-07-21 00:09:34 +00:00
Jooyung Han
d0798d7117 Merge "ZipUtils: use FileChannel#size" 2021-07-20 23:50:59 +00:00
Tianjie
fdf7b58a43 Add a system API UpdateEngine to switch the slot back and forth 
In some cases, the OTA update want to flip the slot to source
without cancelling the entire update. The functionality was
achieved by ResetStatus(). However ResetStatus() will clean up
the update progress and free up space to support virtual A/B.

Details in http://go/no-virtual-ab-switch-off

Test: build
Bug: 187321613
Change-Id: I2abcf8289f5fd573d2b55fa7004ab4dcd175252f
 2021-07-20 15:29:37 -07:00
Treehugger Robot
ac876d9e8e Merge "Enable specification of 5G network info and carrier configs for ONS changes" am: bd268448fa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1754972

Change-Id: Iee54dacaf4126b8e9369e4b1d6516568c3dacbf6
 2021-07-20 19:59:46 +00:00
Treehugger Robot
bd268448fa Merge "Enable specification of 5G network info and carrier configs for ONS changes" 2021-07-20 19:45:42 +00:00
Hans Boehm
c9984045a5 Merge "More consistently retry system calls on EINTR" am: e9554cb77c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1771797

Change-Id: I77c622dbbeaa49f1aa390701ef853a0fc229bc26
 2021-07-20 18:15:14 +00:00
Treehugger Robot
3c3fcf6865 Merge "Scale stack dump timeout with HW_TIMEOUT_MULTIPLIER." am: cf89aac24b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1768622

Change-Id: Ibcb6a9fa366129d807d7a8662f26cc5427893720
 2021-07-20 18:14:52 +00:00
Treehugger Robot
e2d2a4be1f Merge changes I31ddbed9,I702a2449 am: a730b44c86 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1489240

Change-Id: I490ac9074ecbf513b111108a8835e700d03af1fb
 2021-07-20 18:14:19 +00:00
Venkatarama NG. Avadhani
c6204b79fb HDMICEC: Add equals test for DeviceConfig am: 555aa8a7fd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1489239

Change-Id: I4aceffebbeface4723bcb5409063053740c0fdce
 2021-07-20 18:14:16 +00:00
SongFerngWang
4a66d8e542 Changing DEVICE_NR_CAPABILITY type and renaming getMaxActiveInternetData 
DEVICE_NR_CAPABILITY_*: Using int array instead of bitmask
Rename getMaxActiveInternetData and remove SystemAPI
Rename getMaxActivePacketSwitchedVoiceCalls

Bug: 180419672
Test: atest CtsTelephonyTestCases:android.telephony.cts.TelephonyManagerTest#testGetPhoneCapabilityAndVerify
atest CellularNetworkValidatorTest
atest PhoneCapabilityTest
atest PhoneSwitcherTest
atest TelephonyRegistryTest

Change-Id: Ia394537ec57900a410b283ddffdcead017e6d9c6
Merged-In: Ia394537ec57900a410b283ddffdcead017e6d9c6
 2021-07-21 01:37:58 +08:00