Jack Yu
392fae6943
[automerger skipped] Merge "API review feedback changes" am: 84ea11384d am: 6c1815ac79
...
am: 8d824a7786 -s ours
am skip reason: change_id I3c2d406fed3ddaf62dee193c7657caf8c5bc13d2 with SHA1 20d71403b8 is in history
Change-Id: I794dd67b81d909d713b2a82f23b209e294dd8ba2
2019-03-20 17:18:35 -07:00
TreeHugger Robot
b786846f64
Merge "Change font style for app entities widget"
2019-03-21 00:07:41 +00:00
TreeHugger Robot
b9b1befb36
Merge "Trigger Augmented Autofill when the standard service used FillResponse.disableAutofill()"
2019-03-20 23:59:30 +00:00
Jack Yu
8d824a7786
Merge "API review feedback changes" am: 84ea11384d
...
am: 6c1815ac79
Change-Id: Ibc28787179d9053773f4557b9058713fb57b1586
2019-03-20 16:52:00 -07:00
Jeff Sharkey
8c6eee1124
Merge "Implement dual-permission model for storage."
2019-03-20 23:49:08 +00:00
Jeff Sharkey
4d5206ebe5
Merge "Recover from app-op corruption bug."
2019-03-20 23:44:32 +00:00
Jeff Sharkey
5212157f0b
Merge "Fix reading app ops data - framework"
2019-03-20 23:44:16 +00:00
Jack Yu
6c1815ac79
Merge "API review feedback changes"
...
am: 84ea11384d
Change-Id: I37c4f558d313d3ea7f201633273dc53f6ffd128c
2019-03-20 16:36:19 -07:00
Shuo Qian
7ae19eceba
[automerger skipped] Merge "Add Prefix per Carrier requirement" am: 592e9abb0b am: c9da35e296
...
am: 8dc69deb34 -s ours
am skip reason: change_id Ib9b96bb0a210aba64a8652984d22f3564813fa9d with SHA1 69f48c5e90 is in history
Change-Id: I81c643a83ee5f91429045bd96abb0a42a7344ae2
2019-03-20 16:24:45 -07:00
Treehugger Robot
84ea11384d
Merge "API review feedback changes"
2019-03-20 23:22:20 +00:00
Shuo Qian
8dc69deb34
Merge "Add Prefix per Carrier requirement" am: 592e9abb0b
...
am: c9da35e296
Change-Id: I1bd9b341e5f7ac2d512e3a22ecd0a3a8af2b69a8
2019-03-20 16:11:18 -07:00
Anil Admal
500b316a02
Merge "Update getGnssCapabilities() in LMS to include sub-HAL capabilities"
2019-03-20 23:05:12 +00:00
Shuo Qian
c9da35e296
Merge "Add Prefix per Carrier requirement"
...
am: 592e9abb0b
Change-Id: I84cae8e10cd495d2504f6dddba0f622b8c3b49a0
2019-03-20 15:57:24 -07:00
Shuo Qian
592e9abb0b
Merge "Add Prefix per Carrier requirement"
2019-03-20 22:44:59 +00:00
TreeHugger Robot
84c457fb39
Merge "API cleanup: remove PackageInstaller.SessionParams#setEnableRollback"
2019-03-20 22:39:25 +00:00
Evan Rosky
f54473a80b
Merge "Clip transition animations within a task to the task"
2019-03-20 21:18:02 +00:00
sqian
108cb12a6a
Add Prefix per Carrier requirement
...
Some carrier requires if users dial an emergency number address with
some prefix, the combination of the prefix and the address is also a
valid emergency number to dial.
Bug: 122429213
Test: Treehugger
Change-Id: Ib9b96bb0a210aba64a8652984d22f3564813fa9d
Merged-In: Ib9b96bb0a210aba64a8652984d22f3564813fa9d
(cherry picked from commit 69f48c5e90 )
2019-03-20 14:16:14 -07:00
TreeHugger Robot
3748ec15f8
Merge "Add logging for the detailed reason of screen on/off."
2019-03-20 21:09:25 +00:00
Jack Yu
1b9eafb4f4
API review feedback changes
...
Made the follwing changes based on API council review
feedback
1. Made the class and its Builder class final
2. Removed methods that should not be in the builder
3. Changed the return type of available services
from array to list.
Test: Unit tests
Bug 127657991
Merged-In: I3c2d406fed3ddaf62dee193c7657caf8c5bc13d2
Change-Id: I3c2d406fed3ddaf62dee193c7657caf8c5bc13d2
(cherry picked from commit 20d71403b8 )
2019-03-20 14:08:27 -07:00
Brad Ebinger
d2b1925d5f
Merge "Make ImsException final" am: cdc0da732d am: ec6bf56d64
...
am: 89a9462bfa
Change-Id: I71956dd999c8ec4be67bb6d58e1a1c3101e7c2b8
2019-03-20 13:53:13 -07:00
Adam He
3be2db9bbf
Merge "Persists LocusId for Shortcuts."
2019-03-20 20:42:57 +00:00
TreeHugger Robot
d766168cda
Merge "New autofill cmds to enable / disable / check default augmented service."
2019-03-20 20:42:06 +00:00
Brad Ebinger
89a9462bfa
Merge "Make ImsException final" am: cdc0da732d
...
am: ec6bf56d64
Change-Id: I21066c2da0f05fdb0fd7b34744d173ab9a63a43d
2019-03-20 13:39:29 -07:00
Brad Ebinger
ec6bf56d64
Merge "Make ImsException final"
...
am: cdc0da732d
Change-Id: Ic2aafb555b69398852409fc80f6ace5f0f92d1dc
2019-03-20 13:29:07 -07:00
Todd Kennedy
29162935f0
Merge "OMS: expose getOverlayInfo API"
2019-03-20 20:15:48 +00:00
TreeHugger Robot
3451f44858
Merge "Make PackageKetSetData use erase"
2019-03-20 20:14:34 +00:00
TreeHugger Robot
e0bbc2761f
Merge "RRO: Flag ApplicationInfo if it's an RRO"
2019-03-20 20:13:44 +00:00
TreeHugger Robot
be1d460a88
Merge "Revive the old behavior of unsupported filed in public APIs"
2019-03-20 20:11:14 +00:00
Brad Ebinger
cdc0da732d
Merge "Make ImsException final"
2019-03-20 20:10:32 +00:00
Nadav Bar
67122808dc
Merge "Annotate ODI_CAPTIONS_ENABLED with @SystemApi"
2019-03-20 19:32:06 +00:00
Android Build Merger (Role)
f80f50d9eb
Merge "Merge "Remove telephony-common classes." am: 6d77176920 am: bfed6db4e1 am: 76ff86d56a"
2019-03-20 19:19:27 +00:00
Steven Moreland
506dd4a297
Merge "Remove telephony-common classes." am: 6d77176920 am: bfed6db4e1
...
am: 76ff86d56a
Change-Id: I43a4022c8c6f723098643faaa21e4b3f63ebf96c
2019-03-20 12:18:23 -07:00
TreeHugger Robot
9b8b3cec4e
Merge "Add IRNSS to GnssConstellationType (framework)"
2019-03-20 19:18:21 +00:00
Matt Pape
8b7b17b8f9
Merge "Remove interface for Storage."
2019-03-20 19:15:52 +00:00
TreeHugger Robot
a1feb4cd63
Merge "Refine broadcast in commitRollback"
2019-03-20 19:12:02 +00:00
TreeHugger Robot
f48b706f27
Merge "Fixed logic on update()."
2019-03-20 19:08:31 +00:00
Steven Moreland
76ff86d56a
Merge "Remove telephony-common classes." am: 6d77176920
...
am: bfed6db4e1
Change-Id: Ib93ef0ac42a5a67acb5e9ca6d85b4fd6ba065f8c
2019-03-20 12:05:41 -07:00
Felipe Leme
adb34f58de
Trigger Augmented Autofill when the standard service used FillResponse.disableAutofill()
...
Test: atest CtsAutoFillServiceTestCases:android.autofillservice.cts.augmented.DisableAutofillTest
Test: atest CtsAutoFillServiceTestCases # sanity check
Fixes: 123099744
Change-Id: Ic40727a72f931d7a062dedf02fa83d091648498b
2019-03-20 12:03:30 -07:00
Pengquan Meng
e594b99e1d
[automerger skipped] Merge "[API feedback] fixed API for NR" am: 7afba9e583 am: ffddf67508
...
am: a70d308d65 -s ours
am skip reason: change_id I133075a3688c3fa7550c8a2f43bc13d8b25999b2 with SHA1 ae718f9e56 is in history
Change-Id: Ib269077200926158c639506983ae446a02e55435
2019-03-20 12:02:24 -07:00
Pengquan Meng
a70d308d65
Merge "[API feedback] fixed API for NR" am: 7afba9e583
...
am: ffddf67508
Change-Id: Ic3d7bf6773c61b8f738164e6a41ea616dd0286ac
2019-03-20 11:52:27 -07:00
TreeHugger Robot
9ad5ddfc33
Merge "Remove battery icon from BT combined icon"
2019-03-20 18:51:28 +00:00
Steven Moreland
bfed6db4e1
Merge "Remove telephony-common classes."
...
am: 6d77176920
Change-Id: I04c352cc56f66b06142c9a94f0b7ca7d51b26195
2019-03-20 11:46:35 -07:00
Pengquan Meng
ffddf67508
Merge "[API feedback] fixed API for NR"
...
am: 7afba9e583
Change-Id: I703b745d276171f57092668d502441d45ae6ded6
2019-03-20 11:42:00 -07:00
Steven Moreland
91fbb6235c
Merge "pm: SharedLibraryInfo: toString closing bracket" am: 05a8e0b44c am: 48b058ef41
...
am: c56862250d
Change-Id: I65675ef168b7c0a17cf0598ad2124e978ad8131c
2019-03-20 11:41:23 -07:00
TreeHugger Robot
5942b376fd
Merge "Fix idmap enforce overlayable bug"
2019-03-20 18:33:36 +00:00
TreeHugger Robot
ade947448e
Merge "AAPT2: Delete unused method parameter"
2019-03-20 18:33:06 +00:00
Steven Moreland
6d77176920
Merge "Remove telephony-common classes."
2019-03-20 18:30:10 +00:00
Chen Xu
61cd3214fb
[automerger skipped] Merge "improve mism support for phonestatelistner" am: ed4d220c97 am: a05023c222
...
am: 5cf7557e3f -s ours
am skip reason: change_id I1af07798d7982575cccc27462af179182c033409 with SHA1 0ebc9b67e9 is in history
Change-Id: I313b191c3360897483f41a03cde1db92264677e9
2019-03-20 11:25:26 -07:00
Steven Moreland
c56862250d
Merge "pm: SharedLibraryInfo: toString closing bracket" am: 05a8e0b44c
...
am: 48b058ef41
Change-Id: Ib7d2078a0f995a8d6a1ba7ea39dd6e1dd5ea0963
2019-03-20 11:22:29 -07:00
Pengquan Meng
7afba9e583
Merge "[API feedback] fixed API for NR"
2019-03-20 18:22:16 +00:00