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

566930 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SongFerng Wang
4c8d91f2c8 Merge "Rename AllowedNetworkType to AllowedNetworkTypes" am: dfbd3a4072 am: 4bf02f2282 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614991

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I952841fe940d2224b9e78dd19d295866a7f7eb54
 2021-03-09 13:25:55 +00:00
SongFerng Wang
4bf02f2282 Merge "Rename AllowedNetworkType to AllowedNetworkTypes" am: dfbd3a4072 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614991

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd2061cb4d29d9b129e91a68c4e6c20fdea9c5c7
 2021-03-09 13:07:24 +00:00
Lais Andrade
3afe20a305 Merge "Clarify delay parameter documentation in VibrationEffect" am: 2b9f0c7623 am: cdbc51fa52 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622280

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iba4b8b136fae23b31a4f20ad54e66104876745b1
 2021-03-09 13:05:43 +00:00
SongFerng Wang
dfbd3a4072 Merge "Rename AllowedNetworkType to AllowedNetworkTypes" 2021-03-09 12:44:22 +00:00
Lais Andrade
cdbc51fa52 Merge "Clarify delay parameter documentation in VibrationEffect" am: 2b9f0c7623 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622280

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id5144c07827083a0315627f5c327ff38284bf259
 2021-03-09 12:27:08 +00:00
Paul Hu
a8469c27cb Merge "New API for comparing two intents of PendingIntent object." am: 687da317ad am: 46a371b494 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597953

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0beb8b5bebdddba8e01f3dbef595212862150365
 2021-03-09 11:51:29 +00:00
Zoey Chen
4a8217abd9 Merge changes from topic "PSL_TelephonyCallback" am: 456069019e am: 0a1acbbcd3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614981

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic26eea861f33d75b7b5ef62aa411532e52cac51b
 2021-03-09 11:51:08 +00:00
Zoey Chen
a22d9d466d [PhoneStateListener] Redesign PhoneStateListener: Use TelephonyCallback am: 4fff45499f am: a4a9372351 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614979

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ice7b09b8bb7456015e4508732b88dcf729fe1049
 2021-03-09 11:51:04 +00:00
Aaron Huang
90a9b2d025 Merge changes I1d1f0d2d,Ifbd4a978 am: c4f2a30c20 am: 6c13a37bac 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1475901

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7386dfb19911f1b9db39df3b809d18742cc13a75
 2021-03-09 11:49:50 +00:00
Aaron Huang
3913bb35c1 Add a new API in BatteryStatsManager for connectivity service am: 3ae5bdab6e am: 584e64df05 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1475899

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4f99588f81a9545e91593311d6d4e8e6c64659e
 2021-03-09 11:49:44 +00:00
Lais Andrade
2b9f0c7623 Merge "Clarify delay parameter documentation in VibrationEffect" 2021-03-09 11:46:43 +00:00
Paul Hu
46a371b494 Merge "New API for comparing two intents of PendingIntent object." am: 687da317ad 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597953

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I72c2dd4e9a93fc8e4f3494755940e103b7b820a3
 2021-03-09 11:28:41 +00:00
Zoey Chen
0a1acbbcd3 Merge changes from topic "PSL_TelephonyCallback" am: 456069019e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614981

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd41c34f9e4dff1ca7930a9fc2a6f06ec8c316ba
 2021-03-09 11:24:06 +00:00
Zoey Chen
a4a9372351 [PhoneStateListener] Redesign PhoneStateListener: Use TelephonyCallback am: 4fff45499f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614979

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4aeb97cc5964a09178be43511c45910442a096b9
 2021-03-09 11:21:50 +00:00
Aaron Huang
6c13a37bac Merge changes I1d1f0d2d,Ifbd4a978 am: c4f2a30c20 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1475901

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I156b9230ef2ea495a6d1661c3f618de4a9c2ac2a
 2021-03-09 11:14:40 +00:00
Aaron Huang
584e64df05 Add a new API in BatteryStatsManager for connectivity service am: 3ae5bdab6e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1475899

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97fc5426d302d6084e8434daa3f6c9b2389be449
 2021-03-09 11:11:49 +00:00
Paul Hu
687da317ad Merge "New API for comparing two intents of PendingIntent object." 2021-03-09 10:55:00 +00:00
Zoey Chen
456069019e Merge changes from topic "PSL_TelephonyCallback" 
* changes:
  [Telephony] Use TelephonyCallback instead of PhoneStateListener part1
  [PhoneStateListener] Redesign PhoneStateListener: Use TelephonyCallback
 2021-03-09 10:36:03 +00:00
Aaron Huang
c4f2a30c20 Merge changes I1d1f0d2d,Ifbd4a978 
* changes:
  Communicate with BatteryStatsService through BatteryStatsManager
  Add a new API in BatteryStatsManager for connectivity service
 2021-03-09 10:33:56 +00:00
Treehugger Robot
d4e1a70921 Merge "Add final qualifier in LocationPermissionChecker" am: b002b20492 am: 50843debeb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618842

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I60de5561418ac24a1210dec2d4ecaf16d1779518
 2021-03-09 08:26:17 +00:00
Chalard Jean
614d5de20d Merge "Replace withCleanCallingIdentity with [clear|restore]CallingIdentity" am: 5b7b782a3b am: e3a7d6a258 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615182

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I242abe2597ad717026afc547f05701ed8c41aa5c
 2021-03-09 08:26:04 +00:00
Treehugger Robot
50843debeb Merge "Add final qualifier in LocationPermissionChecker" am: b002b20492 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618842

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic07a7bd60e51b5ae6f60f168cfe2b7a7c1848e6f
 2021-03-09 08:11:00 +00:00
Zoey Chen
8a7ec68660 Merge "[Telephony] Fix the unknown value of ARFCN from -1 to INT.MAX" am: 761614c85f am: 7d90db3c30 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618841

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie5ea2c7ab65cbab16b0a117537e4c7b505458344
 2021-03-09 08:07:41 +00:00
Chalard Jean
e3a7d6a258 Merge "Replace withCleanCallingIdentity with [clear|restore]CallingIdentity" am: 5b7b782a3b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615182

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I376927831333a78dc2c60b5be23324b8f0395c58
 2021-03-09 08:07:32 +00:00
Treehugger Robot
b002b20492 Merge "Add final qualifier in LocationPermissionChecker" 2021-03-09 07:58:14 +00:00
Chalard Jean
5b7b782a3b Merge "Replace withCleanCallingIdentity with [clear|restore]CallingIdentity" 2021-03-09 07:41:13 +00:00
Zoey Chen
7d90db3c30 Merge "[Telephony] Fix the unknown value of ARFCN from -1 to INT.MAX" am: 761614c85f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618841

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8661a8355fc293faab2ca62c938e5a3ae9d840ae
 2021-03-09 07:31:23 +00:00
Zoey Chen
761614c85f Merge "[Telephony] Fix the unknown value of ARFCN from -1 to INT.MAX" 2021-03-09 07:06:06 +00:00
Aaron Huang
d394db6b4f Communicate with BatteryStatsService through BatteryStatsManager 
Mainline connectivity service is only allowed to use formal
APIs. Use new system API in BatteryStatsManager instead of
calling BatteryStatsService directly.

Bug: 171686421
Test: FrameworksNetTests
Change-Id: I1d1f0d2d456003e842ad77519667c0532995610d
Merged-In: I1d1f0d2d456003e842ad77519667c0532995610d
 2021-03-09 06:29:30 +00:00
Aaron Huang
3ae5bdab6e Add a new API in BatteryStatsManager for connectivity service 
Connectivity service(CS) is going to be a mainline module and
currently it uses IBatteryStats to communicate with battery
stats service directly. CS cannot use this way after becomes
a mainline module so add new system APIs to communicate with
battery stats service through BatteryStatsManger.

The new API reportNetworkInterfaceForTransports requires
system-only permission NETWORK_STACK or MAINLINE_NETWORK_STACK
so that given the only caller was in ConnectivityService.

This change only add new surface, the usage in CS will be
updated in follow-up CL.

Bug: 171686421
Test: builds, boot, mobile and wifi work.
Change-Id: Ifbd4a9784ed7664751e69d530f8204e292fa6b39
Merged-In: Ifbd4a9784ed7664751e69d530f8204e292fa6b39
 2021-03-09 06:24:50 +00:00
Lucas Lin
9691a4a867 Merge "Use ArraySet#add() instead of ArraySet#append()" am: 55793cc0cb am: 8d07cea94a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615181

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4418327b7201e31620a71b693a70403889a25fbf
 2021-03-09 06:10:20 +00:00
Lucas Lin
8d07cea94a Merge "Use ArraySet#add() instead of ArraySet#append()" am: 55793cc0cb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615181

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1991567f130f3afee6c6bcb78a9254b45e14f6e4
 2021-03-09 05:31:26 +00:00
Chiachang Wang
3b7a716bf4 Merge "Replace ConnectivityManager.isNetworkTypeMobile usage in NSS" am: 874aefac33 am: 1efa411ec7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612298

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I562f3152c1c9f5b360dc7206b888b93d058fe162
 2021-03-09 05:10:16 +00:00
Lucas Lin
55793cc0cb Merge "Use ArraySet#add() instead of ArraySet#append()" 2021-03-09 04:52:42 +00:00
Chiachang Wang
1efa411ec7 Merge "Replace ConnectivityManager.isNetworkTypeMobile usage in NSS" am: 874aefac33 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612298

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I22df755d2226d6e4dec6e25fdcb9ecc249d5e4e6
 2021-03-09 04:28:21 +00:00
Chiachang Wang
874aefac33 Merge "Replace ConnectivityManager.isNetworkTypeMobile usage in NSS" 2021-03-09 03:58:11 +00:00
paulhu
514881581d New API for comparing two intents of PendingIntent object. 
Bug: 174237997
Test: atest PendingIntentTest
Merged-In: Ic5eb20f94ff6fd6953315a5f848effa25b813da7

Change-Id: Ic5eb20f94ff6fd6953315a5f848effa25b813da7
 2021-03-09 02:49:43 +00:00
Makoto Onuki
245befadf1 Merge "[Bugfix] Fix after performing adb shell am hang and kill this process, the phone can not resume from hang state" am: 4d83226663 am: 8f8ffd02f2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1601731

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieff6dfbeda11d1ae6fd6cd9a28cd622f2cec7045
 2021-03-09 02:19:25 +00:00
Cody Kesting
f5d4826ef1 Merge changes I14740854,Id1c2dc28,I4168c868 am: 3b0cb56475 am: 06085e6ab3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607195

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I60fd6aea35944751476e2727936e7988c89de442
 2021-03-09 02:19:16 +00:00
Makoto Onuki
8f8ffd02f2 Merge "[Bugfix] Fix after performing adb shell am hang and kill this process, the phone can not resume from hang state" am: 4d83226663 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1601731

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20ebeab1147f78b7ed2d481f00fd3d8cbb9a7879
 2021-03-09 01:42:36 +00:00
Cody Kesting
06085e6ab3 Merge changes I14740854,Id1c2dc28,I4168c868 am: 3b0cb56475 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607195

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I299178722859a6f0dc1beb6cc41890c63fbf6d0f
 2021-03-09 01:38:49 +00:00
Songchun Fan
3aa5e72742 Merge "[incremental] update owners file for incremental service" am: bc92c6eb23 am: 2432332a16 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623181

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie27abab674040fdd98e01b890285aa814c4d57ba
 2021-03-09 01:16:01 +00:00
Makoto Onuki
4d83226663 Merge "[Bugfix] Fix after performing adb shell am hang and kill this process, the phone can not resume from hang state" 2021-03-09 01:10:27 +00:00
Cody Kesting
3b0cb56475 Merge changes I14740854,Id1c2dc28,I4168c868 
* changes:
  Use clean identity for all calls in/out of VcnMgmtSvc.
  Exit Safe Mode when a VCN gets new configs.
  Notify VcnStatusCallbacks for VCN start/stop.
 2021-03-09 00:57:57 +00:00
Songchun Fan
2432332a16 Merge "[incremental] update owners file for incremental service" am: bc92c6eb23 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623181

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c417309ab56f94bf823f550a304a900c9ef5c52
 2021-03-09 00:38:30 +00:00
Lais Andrade
66a26003e8 Clarify delay parameter documentation in VibrationEffect 
Make it clear in the javadoc for addPrimitive method the start point of the delay parameter, which is right after the previous primitive in the composition has finished.

Fix: 150715908
Test: N/A
Change-Id: Ic88b0d8a31a193b8b1726a9541d9e5955b729866
 2021-03-09 00:22:45 +00:00
Songchun Fan
bc92c6eb23 Merge "[incremental] update owners file for incremental service" 2021-03-08 23:57:53 +00:00
Hui Wang
c4cac7bb2d Merge "Update Provisioning API name and doc per API review" am: 629a24b258 am: f622e0e38e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562933

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I91fbcc91ae746b4008c5028a4ce40d65236300cd
 2021-03-08 22:59:09 +00:00
Hui Wang
f622e0e38e Merge "Update Provisioning API name and doc per API review" am: 629a24b258 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562933

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica3fad113ed39075cefa6f876a18f2badc2ca15c
 2021-03-08 22:16:39 +00:00
Hui Wang
629a24b258 Merge "Update Provisioning API name and doc per API review" 2021-03-08 22:02:20 +00:00