Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
616,509 Commits 3 Branches 0 Tags
09fdba4271877a931acb79e45447a5869eaa8ff4
Commit Graph

616509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
09fdba4271 Migrate frameworks/base/wifi & frameworks/base/packages/OsuLogin 
Migrate to packages/modules/Wifi.  This CL will be presubmit tested
once migration is complete.  This CL drops the code from
frameworks/base/wifi and migrated to packages/modules/Wifi.
Also adjusts visibility rules in frameworks/base/Android.bp
Bug: 137323948
Test: TH

Change-Id: Id02e28648e922a30d6a81cf92b39eff4ca3cc002
 2020-12-23 22:42:10 +00:00
Treehugger Robot
bee02f2ab3 Merge "Add SettingsProvider team as OWNERS of android.provider.Settings" am: d83aa0243b am: f3b68805b1 am: 03b5b82cdf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535814

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I84e7050524fc10d73056cbda897e9672856aeb1c
 2020-12-23 21:49:43 +00:00
Treehugger Robot
9c1f285e86 [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent size of list changes during mPendingNonWakeupAlarms deliver" am: 06550c33ba am: 40209c2af3 -s ours am: e8905d6ec5 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad77c14ce124b2e577af692e19a763dcaacfa931
 2020-12-23 21:49:27 +00:00
Juneup Park
bbaf41acd9 [automerger skipped] RESTRICT AUTOMERGE Prevent size of list changes during mPendingNonWakeupAlarms deliver am: 5504a25a6f am: 218670e095 -s ours am: 8de8f8bdfe -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d691fc109adb2a1d47750dbd1232f4f551be438
 2020-12-23 21:49:19 +00:00
Roshan Pius
46d5d5264f Merge "WifiManager: Remove javadoc reference to multi STA concurrency API" am: 5d3b26484c am: 90a64f7002 am: 5f217f2b9b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535862

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic27ecb61d60865ca268c9f31886d86f3555350ea
 2020-12-23 21:48:59 +00:00
Suprabh Shukla
80b400199c [automerger skipped] Copy the list before passing to deliverAlarms am: 01b2e17cbd am: 61876a7b80 -s ours 
am skip reason: Change-Id I5228c323bb9698864c467e9e4c400459ca404b3c with SHA-1 2c2e1bf150 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d51c5a5c907350296dfde0e76c195946d990154
 2020-12-23 21:46:12 +00:00
Treehugger Robot
03b5b82cdf Merge "Add SettingsProvider team as OWNERS of android.provider.Settings" am: d83aa0243b am: f3b68805b1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535814

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I301c695f862fee869d6dba3eaf6966ba273fc3ca
 2020-12-23 21:38:56 +00:00
Treehugger Robot
e8905d6ec5 [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent size of list changes during mPendingNonWakeupAlarms deliver" am: 06550c33ba am: 40209c2af3 -s ours 
am skip reason: Change-Id I5228c323bb9698864c467e9e4c400459ca404b3c with SHA-1 01b2e17cbd is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I98c52142d9c41d67aef926a1c4249d5fff954d1d
 2020-12-23 21:38:46 +00:00
Juneup Park
8de8f8bdfe [automerger skipped] RESTRICT AUTOMERGE Prevent size of list changes during mPendingNonWakeupAlarms deliver am: 5504a25a6f am: 218670e095 -s ours 
am skip reason: Change-Id I5228c323bb9698864c467e9e4c400459ca404b3c with SHA-1 01b2e17cbd is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9037163b235f27d96a7cf5f962cd0046092dc8b5
 2020-12-23 21:38:37 +00:00
Roshan Pius
5f217f2b9b Merge "WifiManager: Remove javadoc reference to multi STA concurrency API" am: 5d3b26484c am: 90a64f7002 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535862

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4067e60987a0c45a3604862c5f1dd97050f43525
 2020-12-23 21:38:08 +00:00
Terry Wang
2cb0238091 Merge "Support Multi-User AppSearch within SystemServer" 2020-12-23 21:32:24 +00:00
Treehugger Robot
f3b68805b1 Merge "Add SettingsProvider team as OWNERS of android.provider.Settings" am: d83aa0243b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535814

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9e512c6a06eb489a04639dde7158383cafb8f37e
 2020-12-23 21:28:00 +00:00
Treehugger Robot
40209c2af3 Merge "RESTRICT AUTOMERGE Prevent size of list changes during mPendingNonWakeupAlarms deliver" am: 06550c33ba 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471525

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id40b4bedeb892aee3cc1c19037e8924125725a3b
 2020-12-23 21:25:47 +00:00
Suprabh Shukla
61876a7b80 Copy the list before passing to deliverAlarms am: 01b2e17cbd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13256822

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I87164b4dc176146e480a62679d87467054bfe4cb
 2020-12-23 21:23:58 +00:00
Juneup Park
218670e095 RESTRICT AUTOMERGE Prevent size of list changes during mPendingNonWakeupAlarms deliver am: 5504a25a6f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471525

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5199a2e3004547d2728c32b733a43106382ad023
 2020-12-23 21:22:16 +00:00
Ameer Armaly
aac39ed526 Merge "Make AccessibilityGestureEvent.gestureIdToString public." 2020-12-23 21:21:39 +00:00
Roshan Pius
90a64f7002 Merge "WifiManager: Remove javadoc reference to multi STA concurrency API" am: 5d3b26484c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535862

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9a642bfb12a670b4a75341923b04c6a096c75ff
 2020-12-23 21:17:36 +00:00
Automerger Merge Worker
bc260a6ef8 Merge changes from topic "am-16cd9164212e4a1fbb9677984db72e08" 
* changes:
  [automerger skipped] Merge changes from topic "wifi_transport_info_stage_1" am: e126101fe6 am: 58c94eda42 am: 741b00a913 -s ours
  [automerger skipped] Convert WifiInfo to TransportInfo am: 6c5626edfc am: 78111d5950 am: ad29f8165c -s ours
 2020-12-23 21:17:14 +00:00
Roshan Pius
374fa7e0dc [automerger skipped] Merge changes from topic "wifi_transport_info_stage_1" am: e126101fe6 am: 58c94eda42 am: 741b00a913 -s ours 
am skip reason: Change-Id I215b769339f68b76a1b2fa15f66c4527d184b696 with SHA-1 80222a8079 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c79d56329da2544e3f0d8520a66b227e3b1e4b5
 2020-12-23 21:17:03 +00:00
Baligh Uddin
20ba0a3ea5 [automerger skipped] Add visibility rule for migration. am: 693c6f7af2 -s ours 
am skip reason: Change-Id I2bf7e83bb6f4fd67f7826bf8087674a82c6577c9 with SHA-1 7102a65179 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ff3a890bdba3d451e8783a3b1c19cb1a19bddda
 2020-12-23 21:16:57 +00:00
Roshan Pius
a1871bab97 [automerger skipped] Convert WifiInfo to TransportInfo am: 6c5626edfc am: 78111d5950 am: ad29f8165c -s ours 
am skip reason: Change-Id I12c473185dc5518f5684e83c2f49e07271738cb5 with SHA-1 36f802a060 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I81556bd7875c0b03398a8c65601d8c12829c280e
 2020-12-23 21:16:48 +00:00
Roshan Pius
741b00a913 Merge changes from topic "wifi_transport_info_stage_1" am: e126101fe6 am: 58c94eda42 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1508601

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idec02d9238d199c451ef6522670ba0595b39ef8c
 2020-12-23 20:46:51 +00:00
Roshan Pius
ad29f8165c Convert WifiInfo to TransportInfo am: 6c5626edfc am: 78111d5950 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1508600

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2358af6cf716e6924749ec83ffe7075cad83aaf9
 2020-12-23 20:46:49 +00:00
Treehugger Robot
d83aa0243b Merge "Add SettingsProvider team as OWNERS of android.provider.Settings" 2020-12-23 20:45:23 +00:00
Treehugger Robot
06550c33ba Merge "RESTRICT AUTOMERGE Prevent size of list changes during mPendingNonWakeupAlarms deliver" 2020-12-23 20:38:08 +00:00
Roshan Pius
5d3b26484c Merge "WifiManager: Remove javadoc reference to multi STA concurrency API" 2020-12-23 20:33:34 +00:00
TreeHugger Robot
b302674c00 Merge "Update notif onClick logic" 2020-12-23 20:31:45 +00:00
Roshan Pius
be39ce4f19 WifiManager: Remove javadoc reference to multi STA concurrency API 
The multi STA concurrency API is not present in AOSP.

Bug: 162602799
Test: None
Change-Id: Iaecedf42890777f6d4507bb81d359e67270ebebb
 2020-12-23 20:25:37 +00:00
TreeHugger Robot
fc5c68abb3 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-23 20:21:38 +00:00
TreeHugger Robot
ae441ce5de Merge "Override handleShellCommand() in NPMS." 2020-12-23 20:04:42 +00:00
Roshan Pius
58c94eda42 Merge changes from topic "wifi_transport_info_stage_1" am: e126101fe6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1508601

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4298fe6bd7fa674780f07e604c3887aa5b012716
 2020-12-23 20:00:26 +00:00
TreeHugger Robot
4fa37e6985 Merge "AudioService: cache routing queries by stream types" 2020-12-23 19:57:11 +00:00
Roshan Pius
78111d5950 Convert WifiInfo to TransportInfo am: 6c5626edfc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1508600

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec367e9c4d4ec69809e20abc3bb78bea2e4d6d3a
 2020-12-23 19:54:52 +00:00
Suprabh Shukla
01b2e17cbd Copy the list before passing to deliverAlarms 
Downstream code from deliverAlarmsLocked can cause removeLocked or
removeImpl to be called which changes the size of the list.

Test: atest FrameworksMockingServicesTests:com.android.server.alarm

Bug: 175701084
Change-Id: I5228c323bb9698864c467e9e4c400459ca404b3c
Merged-In: I5228c323bb9698864c467e9e4c400459ca404b3c
 2020-12-23 19:53:26 +00:00
Roshan Pius
e126101fe6 Merge changes from topic "wifi_transport_info_stage_1" 
* changes:
  WifiInfo: Add equals implementation
  Convert WifiInfo to TransportInfo
 2020-12-23 19:37:10 +00:00
Juneup Park
5504a25a6f RESTRICT AUTOMERGE Prevent size of list changes during mPendingNonWakeupAlarms deliver 
When device changes from SCREEN_OFF to SCREEN_ON, AlarmManagerService deliver non-wakeup alarms.
If there is TIME_TICK alarm in mPendingNonWakeupAlarms, TIME_TICK alarm is rescheduled.
While TIME_TICK alarm is set again, it is removed from mPendingNonWakeupAlarms.
Because removing alarm from mPendingNonWakeupAlarms change size of mPendingNonWakeupAlarms,
last alarm in mPendingNonWakeupAlarms is not delivered.

Test: build / boot
Change-Id: If0ab601248b4833855e03157cc47ffc678b3b974
Merged-In: I5228c323bb9698864c467e9e4c400459ca404b3c
 2020-12-23 19:35:03 +00:00
Chi Zhang
2d6a37ea0e [automerger skipped] Merge "Cherry-pick "Add band mapping for GERAN and UTRAN" from internal." am: 6e55446222 am: 96caf6d111 am: b09d63e1fa -s ours 
am skip reason: Change-Id I3e8a168a288a436739c369cdaa2ad00f4b4576ed with SHA-1 4bdb3e0561 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I302d89d7fe6479179d7860cd4cf004e7a17eb952
 2020-12-23 18:54:40 +00:00
Anton Hansson
d22c0fa659 Merge "Remove two unused libraries" am: 2458e4ad5d am: 97bf4d0551 am: a914538105 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535143

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide06e37c4bec2eac5b65b277307ffcfb96cfedf7
 2020-12-23 18:54:04 +00:00
Roshan Pius
7db76b6723 Merge changes from topic "wifi_transport_info_stage_1" 
* changes:
  WifiInfo: Add equals implementation
  Convert WifiInfo to TransportInfo
 2020-12-23 18:35:31 +00:00
Chi Zhang
b09d63e1fa Merge "Cherry-pick "Add band mapping for GERAN and UTRAN" from internal." am: 6e55446222 am: 96caf6d111 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527198

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d123b95985960f4f8e0243e22071e5aa8fc69dc
 2020-12-23 18:34:59 +00:00
Anton Hansson
a914538105 Merge "Remove two unused libraries" am: 2458e4ad5d am: 97bf4d0551 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535143

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id61f9d67f948dfde4d5398e756f6394a4d358270
 2020-12-23 18:34:34 +00:00
Amy Zhang
132c50ea86 Merge "Allow Tuner to update client priority without override the default priority" 2020-12-23 18:23:24 +00:00
Chi Zhang
96caf6d111 Merge "Cherry-pick "Add band mapping for GERAN and UTRAN" from internal." am: 6e55446222 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527198

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a3d1baf4a9449831261728c6f6bb092ade3816b
 2020-12-23 18:09:13 +00:00
TreeHugger Robot
c8c707c171 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-23 18:08:46 +00:00
Anton Hansson
97bf4d0551 Merge "Remove two unused libraries" am: 2458e4ad5d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535143

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie4f69a012e2f0f26264382f39fd6d2ef86d50a8d
 2020-12-23 18:05:47 +00:00
Baligh Uddin
693c6f7af2 Add visibility rule for migration. 
Add paths to visibility needed for tests.
Soong allows specifying paths w/o validation.  Once the
migration is complete, we can remove the old path in
visibility rules.

BUG: 137323948
Test: TH
Merged-In: I2bf7e83bb6f4fd67f7826bf8087674a82c6577c9
Change-Id: I9a25986803126adc175e9da9638586b463dda774
 2020-12-23 17:47:18 +00:00
Chi Zhang
6e55446222 Merge "Cherry-pick "Add band mapping for GERAN and UTRAN" from internal." 2020-12-23 17:22:16 +00:00
TreeHugger Robot
dd95959991 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-23 17:20:21 +00:00
Suprabh Shukla
0f267888c9 Merge "Copy the list before passing to deliverAlarms" 2020-12-23 17:20:15 +00:00
Anton Hansson
2458e4ad5d Merge "Remove two unused libraries" 2020-12-23 17:18:12 +00:00