Commit Graph

617665 Commits

Author SHA1 Message Date
Yu-Han Yang
cc163bab25 Remove indoorProbability from NLP extras before delivering to clients
Bug: 176905795
Test: on device
Change-Id: I56f0a2f117acfa9971222980acc7ed9f273da820
2021-01-12 16:08:30 -08:00
TreeHugger Robot
77ff851a57 Merge "Implement AIDL setCapabilitiesCb" 2021-01-07 23:55:53 +00:00
Jacky Kao
4eb327a07a Merge "Allow services enabled after force close" 2021-01-07 23:45:20 +00:00
TreeHugger Robot
a4c1faff5b Merge "Create copy of op list, return empty if indicators disabled" 2021-01-07 23:21:46 +00:00
TreeHugger Robot
9f053e5fb8 Merge "Add GNSS capabilities and antenna broadcasts" 2021-01-07 23:05:01 +00:00
Makoto Onuki
805d08aeec Merge "Enable FGS BG start restriction for apps targeting S" 2021-01-07 22:49:35 +00:00
Joshua Mccloskey
dba641eb53 Merge "Added nullptr check to pullFaceSettingsLocked" 2021-01-07 22:36:11 +00:00
TreeHugger Robot
335a8658a7 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-01-07 22:17:01 +00:00
Mark Renouf
40b54b095b Merge "Screenshots: use ImageExporter" 2021-01-07 22:13:03 +00:00
TreeHugger Robot
bad0e92e7e Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-01-07 22:04:58 +00:00
Treehugger Robot
2c3ca49e7c Merge "Update deprecated link to RecyclerView" am: 9e1690609b am: 98aee6b904 am: a8faba9e7c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539888

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8309f40200033b4358f8cba0c1868eccf1c18658
2021-01-07 21:36:02 +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
Andrii Kulian
24686a6744 Merge "Add an option to ignore display cutout in DisplayWindowSettings" 2021-01-07 21:17:14 +00:00
Nate Myren
0767818077 Create copy of op list, return empty if indicators disabled
When assembling the op list, create a copy, do not use the existing
camera op list, as that list is final. Also return an empty list when
indicators are disabled, not null.

Fixes: 177005228
Test: Manual
Change-Id: I281085c12f0706836098fc2f16d196887596170e
2021-01-07 13:12:19 -08: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
677c97ddf8 Merge "Pass focused field's ViewNode information in the augmented autofill request" 2021-01-07 20:25:15 +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
Jordan Liu
a37c840348 Merge "Update allowlist for shell and BIND_CARRIER_SERVICE" 2021-01-07 19:53:36 +00:00
Oscar Azucena
cdd69e639b Merge "Refactored base code to getDeviceForPortId" 2021-01-07 19:53:04 +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
82231edfc7 [automerger skipped] Merge "Add title and description of MANAGE_ONGOING_CALLS" am: 4506656274 am: c33f2e50b4 am: c46ce88a13 -s ours
am skip reason: Change-Id I7892d9fe2b52f281c7e9309c4e9a7bb0b9c875d1 with SHA-1 3c8bac198e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaadb83b2699696ff96bfcf4a3109ff5a8705d013
2021-01-07 19:29:27 +00:00
Bill Yi
a3ecf2944d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ida2c4d9ec8bb212d8e1420d57be64cabdec6fbcd
2021-01-07 19:29:19 +00:00
Shuo Qian
137df0604d [automerger skipped] Merge "Add Setting API to set/get enriched calling with call composer user option" am: 077cefb9a9 am: edeb75ca4c am: ac6339ae1d -s ours
am skip reason: Change-Id Iaf2cb72864dca992249395103aedee93ff8d3ac0 with SHA-1 ccc5af201a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I338c73b310d7025bbc6511caa5cb10218f4d64b3
2021-01-07 19:28:41 +00:00
Treehugger Robot
60decee64a 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 am: f791c03410
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527769

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie4fafafa85b429baeb79ecd69a345f599a2d6b01
2021-01-07 19:24:06 +00:00
Lorenzo Colitti
85191e98f4 Merge changes Iec22ff63,Iaca8a7cc am: 5a5613209d am: 26e29afb3e am: bdba76fe13
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528211

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I293366c6aac42f776ff23277a707d8c2ae0fd1b0
2021-01-07 19:22:06 +00:00
Ryan Mitchell
597cb08904 Merge changes from topic "oms-transactional-api" am: b9ba6a8d0f am: f50bf40b9b am: 13405917a6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1236071

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie83aa9bcb14313bb721908c79a4d53d05e86eb99
2021-01-07 19:19:29 +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
Colin Cross
9134bffa4b Merge changes from topic "revert-connectivity_jar_in_apex"
* changes:
  Revert "Set setCurrentProxyScriptUrl as public"
  Revert "Move service-connectivity to the tethering APEX"
2021-01-07 19:00:24 +00:00
Daniel Bright
f85f637236 Merge "Changed ApnThrottleStatus to ThrottleStatus" 2021-01-07 18:58:50 +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