Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
562,978 Commits 3 Branches 0 Tags
fe39a927b58ea563f567f94bd252fd490024df5f
Commit Graph

562978 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
fe39a927b5 Merge "Pivot network statistics to use DataInput/Output." am: 5b322f10be am: 5c5eff8d5c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540224

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic0502659732c1957b297095a5332e6dc0b514397
 2021-01-08 11:33:57 +00:00
Treehugger Robot
5c5eff8d5c Merge "Pivot network statistics to use DataInput/Output." am: 5b322f10be 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540224

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86021070223e8825ba19bd84946ef89b56dc3f35
 2021-01-08 10:56:59 +00:00
Treehugger Robot
5b322f10be Merge "Pivot network statistics to use DataInput/Output." 2021-01-08 10:33:16 +00:00
Treehugger Robot
68ba39f6d7 Merge "Add team members to biometric OWNERS" am: 80df223aed am: 2dc1d17689 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1543964

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0cdd444845e2f484e26045c04facbce2e33c95ba
 2021-01-08 10:14:06 +00:00
Treehugger Robot
35028e9f0b Merge "Set max frequency as Max_Value of integer if it's negative." am: 4a17bccf59 am: 30f0456d60 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542427

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I02cfbd754a58d7af4010b8885463cba628c89809
 2021-01-08 10:13:47 +00:00
Shuo Qian
d26b0ed704 Merge "Add Call Composer Tuple in RcsContactPresenceTuple class" am: 45a397a84a am: f9bdfcccc4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542210

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb76e030bf27e1c8c6b80158a0c7165136cd7493
 2021-01-08 10:11:16 +00:00
Les Lee
026441fcd5 Merge "wifi: Add systemAPi:setSubscriberId in NetworkAgentConfig" am: 6ae2535ec6 am: 2f8f97c64c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536153

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4f4e7bfc059df3415378179b3d70ca35b8ebf4f1
 2021-01-08 10:10:29 +00:00
Treehugger Robot
2dc1d17689 Merge "Add team members to biometric OWNERS" am: 80df223aed 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1543964

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I81f542632328cdb628e3e873d1a04beeb7a1a860
 2021-01-08 09:34:42 +00:00
Treehugger Robot
30f0456d60 Merge "Set max frequency as Max_Value of integer if it's negative." am: 4a17bccf59 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542427

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib0003e60eaca81ab9894cdfa98c2aad01bc25560
 2021-01-08 09:31:18 +00:00
Shuo Qian
f9bdfcccc4 Merge "Add Call Composer Tuple in RcsContactPresenceTuple class" am: 45a397a84a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542210

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2ee6e39cecc75ce25a01c5d0824b657771391cb4
 2021-01-08 09:24:47 +00:00
Treehugger Robot
80df223aed Merge "Add team members to biometric OWNERS" 2021-01-08 04:20:25 +00:00
Treehugger Robot
4a17bccf59 Merge "Set max frequency as Max_Value of integer if it's negative." 2021-01-08 03:16:19 +00:00
Shuo Qian
45a397a84a Merge "Add Call Composer Tuple in RcsContactPresenceTuple class" 2021-01-08 02:21:34 +00:00
Kevin Chyn
8777a4dda3 Add team members to biometric OWNERS 
Test: Presubmit
Change-Id: I0b503756a60fc8dcaaf8bcd1f1fa13628b2b9b75
 2021-01-07 17:56:19 -08:00
Les Lee
2f8f97c64c Merge "wifi: Add systemAPi:setSubscriberId in NetworkAgentConfig" am: 6ae2535ec6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536153

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I59ab8adad819038715f7534ac746edbf923a92b9
 2021-01-08 01:26:56 +00:00
Les Lee
6ae2535ec6 Merge "wifi: Add systemAPi:setSubscriberId in NetworkAgentConfig" 2021-01-08 00:54:51 +00:00
Henry Fang
7112714a90 Set max frequency as Max_Value of integer if it's negative. 
bug: 176097540
Test: Manual
Change-Id: I17cdd3b2861415b4812694d79aa97f3e7463e12a
 2021-01-08 00:37:11 +00:00
Treehugger Robot
a8faba9e7c Merge "Update deprecated link to RecyclerView" am: 9e1690609b am: 98aee6b904 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539888

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idaa4e0082711e3043038ea565bed623bc70a6e4a
 2021-01-07 21:18:48 +00:00
Neil Fuller
796f747ec1 Merge "Addition of OWNERS / initial .proto file" am: 6aabdca9b3 am: e451a442f4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541857

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id892269377c50d2398fc27b2f28ac0221cdf5e0a
 2021-01-07 21:18:33 +00:00
Treehugger Robot
0e5fbd9fa3 Merge "Fix TelephonyRegistry's mListenLog." am: eedc45be11 am: 00a9ff1f7c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542036

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I447d41bdb9194647e01114101267fefb2a19e5a2
 2021-01-07 21:18:16 +00:00
Benedict Wong
dd9753cfa8 Merge "Repackage vcn utils in frameworks-minus-apex" am: 073452a700 am: 1a63689647 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539684

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idec15fe0ab4611cb22079d59fd9e6291b88fb17a
 2021-01-07 21:17:59 +00:00
Treehugger Robot
98aee6b904 Merge "Update deprecated link to RecyclerView" am: 9e1690609b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539888

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9f0ff14d892c2afffca615973ecb840a655a7c33
 2021-01-07 20:43:43 +00:00
Neil Fuller
e451a442f4 Merge "Addition of OWNERS / initial .proto file" am: 6aabdca9b3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541857

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d9161c4fb603977fb8f4492176dc46c0791d153
 2021-01-07 20:40:57 +00:00
Treehugger Robot
00a9ff1f7c Merge "Fix TelephonyRegistry's mListenLog." am: eedc45be11 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542036

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4df6a4939524b61a547df2bdfcabe65538a7e24b
 2021-01-07 20:37:40 +00:00
Benedict Wong
1a63689647 Merge "Repackage vcn utils in frameworks-minus-apex" am: 073452a700 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539684

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I74c63ace195f8528bcacfacf4366a5014dd28672
 2021-01-07 20:31:45 +00:00
Treehugger Robot
9e1690609b Merge "Update deprecated link to RecyclerView" 2021-01-07 20:13:51 +00:00
Neil Fuller
6aabdca9b3 Merge "Addition of OWNERS / initial .proto file" 2021-01-07 20:08:06 +00:00
Treehugger Robot
eedc45be11 Merge "Fix TelephonyRegistry's mListenLog." 2021-01-07 19:47:00 +00:00
Benedict Wong
073452a700 Merge "Repackage vcn utils in frameworks-minus-apex" 2021-01-07 19:36:24 +00:00
Shuo Qian
c46ce88a13 Merge "Add title and description of MANAGE_ONGOING_CALLS" am: 4506656274 am: c33f2e50b4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534265

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2b84f3a7d100041863d12a3baf853f171f6d8c37
 2021-01-07 19:19:20 +00:00
Shuo Qian
ac6339ae1d Merge "Add Setting API to set/get enriched calling with call composer user option" am: 077cefb9a9 am: edeb75ca4c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535169

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8fb48e3f3bffee1344bb3c7ca25e75e28a111520
 2021-01-07 19:07:33 +00:00
Shuo Qian
c33f2e50b4 Merge "Add title and description of MANAGE_ONGOING_CALLS" am: 4506656274 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534265

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id40ac228e5771419a88bc47977eb74819b313ca4
 2021-01-07 18:56:55 +00:00
Treehugger Robot
f791c03410 Merge "Introduce public APIs to check whether a remote bluetooth headset supports voice recognition as well as echo cancellation and/or noise reduction via the AT+BRSF bitmask" am: 1fb7770381 am: e429dd342b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527769

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib1cb41034a5e9c2eb17c76e4580ca722a17d0723
 2021-01-07 18:48:44 +00:00
Shuo Qian
edeb75ca4c Merge "Add Setting API to set/get enriched calling with call composer user option" am: 077cefb9a9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535169

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I94230a132833fae0e9b798260600c22794e04f77
 2021-01-07 18:48:34 +00:00
Lorenzo Colitti
bdba76fe13 Merge changes Iec22ff63,Iaca8a7cc am: 5a5613209d am: 26e29afb3e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528211

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad0d78dd0787d8eb1da38c208588414b7dfbbdac
 2021-01-07 18:48:31 +00:00
Ryan Mitchell
13405917a6 Merge changes from topic "oms-transactional-api" am: b9ba6a8d0f am: f50bf40b9b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1236071

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad26205fed43fd9082c8995e65592e89d3a64dde
 2021-01-07 18:48:16 +00:00
Automerger Merge Worker
ae6be438cb Merge "Merge changes from topic "revert-1532910-connectivity_jar_in_apex-LKXFLQGLIU" am: 1ef739b3fa" into stage-aosp-master am: 30a3473a61 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541542

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie22d1281939b2191304ecf3c9c8de54913f6aafe
 2021-01-07 18:48:02 +00:00
Treehugger Robot
f4f5a56fa5 Merge changes from topic "revert-1532910-connectivity_jar_in_apex-LKXFLQGLIU" am: 1ef739b3fa am: 3444905f4c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541542

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie8e753e64eefa3a3d30a31af30c437411bf59ece
 2021-01-07 18:48:00 +00:00
Shuo Qian
4506656274 Merge "Add title and description of MANAGE_ONGOING_CALLS" 2021-01-07 18:32:48 +00:00
Shuo Qian
077cefb9a9 Merge "Add Setting API to set/get enriched calling with call composer user option" 2021-01-07 18:32:44 +00:00
Treehugger Robot
e429dd342b Merge "Introduce public APIs to check whether a remote bluetooth headset supports voice recognition as well as echo cancellation and/or noise reduction via the AT+BRSF bitmask" am: 1fb7770381 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527769

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5fbc310b5e64deea669ba91b15dc603c801a0c6d
 2021-01-07 18:23:32 +00:00
Lorenzo Colitti
26e29afb3e Merge changes Iec22ff63,Iaca8a7cc am: 5a5613209d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528211

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a7da1cab20a38cec3e9610a537c6ba9d7a8308d
 2021-01-07 18:16:43 +00:00
Ryan Mitchell
f50bf40b9b Merge changes from topic "oms-transactional-api" am: b9ba6a8d0f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1236071

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia78fd94156fd6ac0cfc3239234eee63822c9e260
 2021-01-07 18:12:27 +00:00
Automerger Merge Worker
30a3473a61 Merge "Merge changes from topic "revert-1532910-connectivity_jar_in_apex-LKXFLQGLIU" am: 1ef739b3fa" into stage-aosp-master 2021-01-07 18:10:58 +00:00
Treehugger Robot
3444905f4c Merge changes from topic "revert-1532910-connectivity_jar_in_apex-LKXFLQGLIU" am: 1ef739b3fa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541542

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I70cdc5ba92d03d76620db5fb2e78a65c9976539c
 2021-01-07 18:06:23 +00:00
Treehugger Robot
72c0dc4fec Merge changes from topic "revert-1532910-connectivity_jar_in_apex-LKXFLQGLIU" am: 1ef739b3fa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541542

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id71e4600041b523d941f6fe7f210c1bec7bb4c21
 2021-01-07 17:58:14 +00:00
Treehugger Robot
1fb7770381 Merge "Introduce public APIs to check whether a remote bluetooth headset supports voice recognition as well as echo cancellation and/or noise reduction via the AT+BRSF bitmask" 2021-01-07 17:55:04 +00:00
Treehugger Robot
27f9f37c0b Merge "MTP: Update language to comply with Android's inclusive language guidance" am: 86b6f66d9f am: 5e5716ef83 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382396

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id177580f106509fab9ec6e706ed9a80b11dd16dc
 2021-01-07 17:45:06 +00:00
Treehugger Robot
5e5716ef83 Merge "MTP: Update language to comply with Android's inclusive language guidance" am: 86b6f66d9f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382396

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf8efbd06b6839f8922cc2415e1d13ddc0769b25
 2021-01-07 17:36:04 +00:00
Jeff Sharkey
16a8431f5c Merge "Update owner for ConnectivityServiceInitializer.java" am: 6e01e06579 am: a9b833b55c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540909

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic44f1fd28d0564848a97370262f9511ea85285a1
 2021-01-07 17:35:58 +00:00