Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
530,366 Commits 3 Branches 0 Tags
04dede7600a0da25fa29fedd9a9ae493bfc0bf0c
Commit Graph

530366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
3ee2ef20c0 Merge "Add the return branch when ringtone position is POS_UNKNOWN" am: 1e97308138 am: e2cfc0393b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426650

Change-Id: I1d5954304b07fd26a6c82bb156f56f928cf0d3ae
 2020-09-22 09:34:09 +00:00
Treehugger Robot
e2cfc0393b Merge "Add the return branch when ringtone position is POS_UNKNOWN" am: 1e97308138 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426650

Change-Id: Id6f84fa9147af94d5923d8892e30233e9fa5f6fe
 2020-09-22 08:15:45 +00:00
Treehugger Robot
1e97308138 Merge "Add the return branch when ringtone position is POS_UNKNOWN" 2020-09-22 07:59:07 +00:00
Jin Seok Park
e8cb1e0dfc Add jinpark to OWNERS 
Removed per-file because it does not appear to work properly.
(All the other owners have ownership to ExifInterface as well)

Test: build
Change-Id: I1a797a269bffca4969ad96ab0f96c14537d0308a
 2020-09-22 15:24:56 +09:00
Chiachang Wang
ca0a1292b2 Remove CONNECTIVITY_ACTION and INET_CONDITION_ACTION 
CONNECTIVITY_ACTION is deprecated. The usage should be either
replaced by using networkcallback or removed. The intent is used
in DataConnectionStats for noting the phone connection state.
The related data and information update should be able to be
covered by PhoneStateListener and ACTION_SIM_STATE_CHANGED
intent. Thus, remove the connectivity intents directly instead
of replacing by NetworkCallback.

Bug: 169029216
Bug: 110246171
Test: atest FrameworkNetTests
Test: adb shell dumpsys batterystats and check the data connection
      stats
Change-Id: I520c5cf224716faa333e479e06b6134ee7d81630
 2020-09-22 02:50:15 +00:00
Seigo Nonaka
a80b45969a Update language to comply with Android’s inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

ListOfEditTexts is not referred anywhere, so good to remove it rather than
fixing words.

Bug: 161896447
Test: atest CharSequencesTest
Change-Id: I9dc07fa5f087e355d01fbc939749fac2f1f1f554
Merged-In: I9dc07fa5f087e355d01fbc939749fac2f1f1f554
 2020-09-22 02:22:28 +00:00
Arc Wang
249f58f3d0 Modify Wi-Fi SettingsLib owners file 
Test: N/A.
Change-Id: I683602342609152d43008141e2927d2be173c26a
 2020-09-22 09:59:08 +08:00
Treehugger Robot
276ee5c666 Merge "TelephonyRegistry: Avoid adding duplicate listener" am: 6334152357 am: 3ba0f5da1d am: 4aeb2ecda5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433021

Change-Id: I8696414ed05edcf453985f4d2639d29634374e70
 2020-09-22 01:43:52 +00:00
Treehugger Robot
4aeb2ecda5 Merge "TelephonyRegistry: Avoid adding duplicate listener" am: 6334152357 am: 3ba0f5da1d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433021

Change-Id: Ie577f0736765ef1c79630c116351a669f972c778
 2020-09-22 01:17:00 +00:00
Treehugger Robot
3ba0f5da1d Merge "TelephonyRegistry: Avoid adding duplicate listener" am: 6334152357 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433021

Change-Id: I5859f20686e50ae9c98f8acca54a375276944073
 2020-09-22 00:33:38 +00:00
Treehugger Robot
6334152357 Merge "TelephonyRegistry: Avoid adding duplicate listener" 2020-09-21 23:57:28 +00:00
Treehugger Robot
b3b2334a37 Merge "Fix deadlock between AppOpsService and HistoricalRegistry." am: 21a4becee0 am: 476c64e470 am: 7904074696 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433271

Change-Id: I8c62def14eba9348649918e25a23828b93bc37be
 2020-09-21 23:19:24 +00:00
Treehugger Robot
3735f6abe4 Merge "Configure Bluetooth profiles displayed in settings" am: 22e174a788 am: d815784643 am: ce0de3705c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424829

Change-Id: I20e984ecc8515928c4702077f31b51abee4d114c
 2020-09-21 23:19:11 +00:00
Treehugger Robot
7904074696 Merge "Fix deadlock between AppOpsService and HistoricalRegistry." am: 21a4becee0 am: 476c64e470 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433271

Change-Id: I9d89f556e5fcca621f9e5e0314c9996faaf8ea11
 2020-09-21 23:07:23 +00:00
Treehugger Robot
476c64e470 Merge "Fix deadlock between AppOpsService and HistoricalRegistry." am: 21a4becee0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433271

Change-Id: I6b7df19f748602ec4448619d204ba9e515d14a44
 2020-09-21 22:59:17 +00:00
Treehugger Robot
ce0de3705c Merge "Configure Bluetooth profiles displayed in settings" am: 22e174a788 am: d815784643 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424829

Change-Id: If06ae17d96c8fbf09c10ed359a01aac07761181e
 2020-09-21 22:57:19 +00:00
Treehugger Robot
d815784643 Merge "Configure Bluetooth profiles displayed in settings" am: 22e174a788 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424829

Change-Id: I72e0218279c3817a5b33c9b0795a4dd672ec7b1b
 2020-09-21 22:34:09 +00:00
Treehugger Robot
21a4becee0 Merge "Fix deadlock between AppOpsService and HistoricalRegistry." 2020-09-21 22:07:45 +00:00
Josh Gao
4c392e8057 FileBridge: fix fd ownership mismanagement. 
This patch switches everything over to ParcelFileDescriptor, but the
important part of the change is changing FileBridge.getClientSocket to
return a ParcelFileDescriptor. Previously, it returned a raw
FileDescriptor that was closed by FileBridge, and the only non-test
caller of that function was taking it and constructing a
ParcelFileDescriptor from it, which would also attempt to close the fd,
leading to an fdsan abort.

Bug: http://b/162811367
Test: atest FileBridgeTest
Test: treehugger
Change-Id: I724ea7601bb072c98895f68abc08bb0e339d1db0
 2020-09-21 14:47:56 -07:00
Treehugger Robot
22e174a788 Merge "Configure Bluetooth profiles displayed in settings" 2020-09-21 21:46:41 +00:00
Xin Li
9d3a79fd38 Merge "Skip android11-tests-dev." am: bb12496933 am: d7bb64fffd am: 3666c431c8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427572

Change-Id: Ifb20ed6c1bb9b71adc14bcd2a43fd72e75102988
 2020-09-21 19:53:18 +00:00
Xin Li
3666c431c8 Merge "Skip android11-tests-dev." am: bb12496933 am: d7bb64fffd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427572

Change-Id: I2b719aa845044fa41f6eb9e4c7e4dfcd76928313
 2020-09-21 19:31:35 +00:00
Xin Li
d7bb64fffd Merge "Skip android11-tests-dev." am: bb12496933 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427572

Change-Id: Id6bf038eec8655ac7daeb6338bd1ab80504b5969
 2020-09-21 18:43:17 +00:00
Wileen Chiu
e305baa074 TelephonyRegistry: Avoid adding duplicate listener 
- Currently, a new callback is created when a listener
  is passed in, so it is possible to create multiple
  callbacks for the same listener
- However, when removing the listener, only the latest
  entry is removed, which could result in improper cleanup
- If a listener is already in the map, do not add the listener
  with the new callback

Change-Id: I46f344eb55db38916224f7765cd838347ac8f0f2
Bug: 168886894
 2020-09-21 11:36:04 -07:00
Xin Li
bb12496933 Merge "Skip android11-tests-dev." 2020-09-21 18:25:44 +00:00
Hai Zhang
8f527b3e99 Fix deadlock between AppOpsService and HistoricalRegistry. 
HistoricalRegistry locks its mOnDiskLock first, and then its
mInMemoryLock (which is the AppOpsService object), so AppOpsService
cannot call into HistoricalRegistry while holding its own lock.

Fixes: 168020658
Test: presubmit
Change-Id: I0d2a38b6b416c59f10d15b60badf234a80f16152
 2020-09-21 17:33:03 +00:00
Anton Hansson
fcb91d4ad0 Move api/*current.txt filegroups into api dir 
The StubLibraries bp file is sufficiently humongous without them.

Bug: 169034951
Test: presubmit
Change-Id: I2809f94f950cdebb6c1fbf8de091e9d9443810d6
 2020-09-21 17:03:14 +01:00
Rubin Xu
2d51788b08 Do not re-initialize synthetic password 
A bug was introduced in R where LSS ends up regenerating SP
when an escrow token is being auto-activated on unsecured user,
due to a logic error in shouldMigrateToSyntheticPasswordLocked().
Fix the bug and add some safeguards as well as unit test to
prevent future regressions.

Bug: 168692734
Test: atest com.android.server.locksettings
Change-Id: If35f2fd26b49faf6e3d0d75c10b1b3bb95f247c2
(cherry picked from commit efc1d53df3)
 2020-09-21 14:46:37 +00:00
Marin Shalamanov
544040036e Merge "Add permission to override display mode requests" am: 7fb5deb779 am: 83a8725d55 am: 794938dfa7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420968

Change-Id: Ic8d98cad7f9c8aed2d967b0959fa0e989a763abb
 2020-09-21 13:27:26 +00:00
Marin Shalamanov
794938dfa7 Merge "Add permission to override display mode requests" am: 7fb5deb779 am: 83a8725d55 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420968

Change-Id: I59da44847b84fc262248409dbe8e49c608743886
 2020-09-21 13:01:37 +00:00
Marin Shalamanov
83a8725d55 Merge "Add permission to override display mode requests" am: 7fb5deb779 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420968

Change-Id: Ie1abcff2b4a0e3394e7dd4a102790bd74609dfa0
 2020-09-21 12:40:50 +00:00
Marin Shalamanov
7fb5deb779 Merge "Add permission to override display mode requests" 2020-09-21 12:23:13 +00:00
Marin Shalamanov
8f2f6d1465 Add permission to override display mode requests 
This permission will be used for testing purposes
to override the display mode requests in DisplayModeDirector.

Bug: 159113268
Bug: 158316271
Test: m
Change-Id: Ibcafc50badcda929c3c3b446b6d0d9045c2a5b6d
Merged-In: I257636ae2a6ed74044e71e49a99024682c3a92c5
 2020-09-21 14:04:48 +02:00
TreeHugger Robot
4250e77273 Merge "Add screenshot back to power menu for some devices" into rvc-dev am: 30233e0682 am: da8d0957ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12549895

Change-Id: Iafff905c65a0947fa84aa6ae526a0a44f2c3f677
 2020-09-19 10:49:01 +00:00
TreeHugger Robot
6dc916a49d Merge "Add screenshot back to power menu for some devices" into rvc-dev am: 30233e0682 am: ab73ba71fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12549895

Change-Id: Idbebc1a6ba29ab7eed0efbeec216b804f8c45a2c
 2020-09-19 10:48:33 +00:00
TreeHugger Robot
da8d0957ae Merge "Add screenshot back to power menu for some devices" into rvc-dev am: 30233e0682 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12549895

Change-Id: If297f4d26596b5ab39de94e4c0e76176a3799681
 2020-09-19 09:54:18 +00:00
TreeHugger Robot
ab73ba71fb Merge "Add screenshot back to power menu for some devices" into rvc-dev am: 30233e0682 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12549895

Change-Id: Id89eef8efb70c95edfdee5703f0dd3e01b07b47a
 2020-09-19 09:53:15 +00:00
TreeHugger Robot
30233e0682 Merge "Add screenshot back to power menu for some devices" into rvc-dev 2020-09-19 09:28:06 +00:00
Treehugger Robot
0620e03d34 Merge "Mark emergency dialer package string as untranslatable." am: 9a4505c4fb am: 635845b15b am: 6f39d5a8c2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1430102

Change-Id: If9140b35302ac550c03b93e04786f04fa968b7b9
 2020-09-19 07:16:33 +00:00
Treehugger Robot
6f39d5a8c2 Merge "Mark emergency dialer package string as untranslatable." am: 9a4505c4fb am: 635845b15b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1430102

Change-Id: Ida845bd34807653bc791389f60cef7bad7ed5bc4
 2020-09-19 07:08:06 +00:00
Amit Mahajan
3ede3f3039 [automerger skipped] Merge "Data connection for carrier specific APN" am: 47a1e949c3 am: ba9b991631 am: eb10ff679b -s ours 
am skip reason: Change-Id If1e6d2bf58de39c22caa901fcd90fb11f104d900 with SHA-1 115e02818a is in history

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

Change-Id: I2290055eea0c8fdcb4f9ba6471f3ed18f09ede23
 2020-09-19 07:05:33 +00:00
Brad Ebinger
454939b8b5 Merge "Fix a typo in service class" am: 7b38b459f3 am: 7420236576 am: 55895d9414 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1429089

Change-Id: I7025ec64f5c9ddb747d9b872304c083a83c6118c
 2020-09-19 07:05:08 +00:00
Bill Yi
f7b9efeff8 [automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: e935e010b3 am: 2075ab0f01 -s ours am: 1de555b1a3 -s ours 
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history

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

Change-Id: I18f6dabacb6e272e2d3fdf63a9220afc5572f2d2
 2020-09-19 07:01:25 +00:00
Bill Yi
c0977118e6 [automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 5b49c68d11 am: 1848cf03d8 -s ours am: 847cfb2230 -s ours 
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history

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

Change-Id: Ib3e8b5c0678513b5128aaf106c8f8044bed09702
 2020-09-19 07:00:58 +00:00
Amit Mahajan
eb10ff679b Merge "Data connection for carrier specific APN" am: 47a1e949c3 am: ba9b991631 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1238996

Change-Id: I5186d773ee3952cee516ac0ccb473352ca847ad9
 2020-09-19 06:57:45 +00:00
Brad Ebinger
55895d9414 Merge "Fix a typo in service class" am: 7b38b459f3 am: 7420236576 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1429089

Change-Id: I44f67a3658ab2d0649f509634afae355f5e2c36e
 2020-09-19 06:09:52 +00:00
Bill Yi
1de555b1a3 [automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: e935e010b3 am: 2075ab0f01 -s ours 
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history

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

Change-Id: I2ad75dfe2a2109ea63eade0ed3edc40b92149a16
 2020-09-19 05:51:33 +00:00
Bill Yi
847cfb2230 [automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 5b49c68d11 am: 1848cf03d8 -s ours 
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history

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

Change-Id: I4a14d0f2ef305f4f564e7e38134763a85fd09ad3
 2020-09-19 05:50:36 +00:00
Treehugger Robot
635845b15b Merge "Mark emergency dialer package string as untranslatable." am: 9a4505c4fb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1430102

Change-Id: I59c2843430e2e9545c4feff69df67e298c168c9b
 2020-09-19 05:42:25 +00:00
Amit Mahajan
ba9b991631 Merge "Data connection for carrier specific APN" am: 47a1e949c3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1238996

Change-Id: Iefc784867da56b9ac0acfe0ac3744da9a3625a14
 2020-09-19 05:37:38 +00:00