Commit Graph

410147 Commits

Author SHA1 Message Date
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
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
TreeHugger Robot
100bb0e692 Merge "[Magnifier-80] Make API getters relative to window" 2019-03-20 18:20:36 +00:00
Pengquan Meng
546c24ccb6 [API feedback] fixed API for NR
This CL included the follow change:
1. Change getPreferredNetworkTypeBitmap to
getPreferredNetworkTypeBitmask [b/126552419]
2. Change setPreferredNetworkTypeBitmap to
setPreferredNetworkTypeBitmask [b/126552419]
3. Add @IntRange annonation to CellIdentityNr.getNrarfcn() [b/126552419]

4. In javadoc, explain the acronym NR to say: (New Radio 5G)
[b/126552559]

5. Mark CellInfoNr.getCellSignalStrength and CellInfoNr.getCellIdentity
    as @NonNull [b/126699572]

6. Mark CellIdentityNr.getMncString() and CellIdentityNr.getMccString()
    as @Nullable [b/126702744]

Bug: 126552419
Bug: 126552559
Bug: 126699572
Bug: 126702744
Test: build
Merged-In: I133075a3688c3fa7550c8a2f43bc13d8b25999b2
Change-Id: I133075a3688c3fa7550c8a2f43bc13d8b25999b2
2019-03-20 11:19:21 -07:00
Chen Xu
5cf7557e3f Merge "improve mism support for phonestatelistner" am: ed4d220c97
am: a05023c222

Change-Id: Icaade79b765a2c27bcf203f40a095b50d2087763
2019-03-20 11:12:32 -07:00
Steven Moreland
48b058ef41 Merge "pm: SharedLibraryInfo: toString closing bracket"
am: 05a8e0b44c

Change-Id: I373baed1fdd987bef7dafdbabacb86a0ef6cfbc0
2019-03-20 11:06:08 -07:00
Felipe Leme
1047cba3e8 Merge "Added manifest metadata to define the content capture settings activity." 2019-03-20 18:04:06 +00:00
Chen Xu
a05023c222 Merge "improve mism support for phonestatelistner"
am: ed4d220c97

Change-Id: If09726fbd0bf82fdbe2da884d97d9b78089eb1ac
2019-03-20 10:55:57 -07:00
Treehugger Robot
05a8e0b44c Merge "pm: SharedLibraryInfo: toString closing bracket" 2019-03-20 17:51:00 +00:00
Wonsik Kim
d0bcc39f55 Merge "MediaFormat: add a key for B frames" 2019-03-20 17:38:28 +00:00
Chen Xu
ed4d220c97 Merge "improve mism support for phonestatelistner" 2019-03-20 17:32:37 +00:00
Seigo Nonaka
7d3d2aa286 Revive the old behavior of unsupported filed in public APIs
The behavior of the Typeface creating function when unsuppoted font
files are passed has changed unexpectedly. This CL revives the old
behaviors. Here is the list of public APIs and expected behaviors.

Resources#getFont for unsupported font
  Exception: Resources#NotFoundException
Resources#getFont for unsupported font in XML
  Exception: Resources#NotFoundException
Resources#getFont for unsupported font from provider
  No Exception: Typeface.DEFAULT is returned

Typeface#Builder for unsupported font
  No Exception: null is returned
Typeface#Builder for unavailable font
  No Exception: null is returned

Typeface#createFromAsset for unsupported font
  Not Exception: Typeface.DEFAULT is returned
Typeface#createFromAsset for unavailable font
  Exception: RuntimeExcetpion

FontsContract#buildTypeface for unspported font
  No Exception: null is returned
FontsContract#buildTypeface for unspported font in XML
  No Exception: null is returned
FontsContract#buildTypeface for unspported font from provider
  No Exception: null is returned

TextView inflation for unsupported font
  No Exception: Typeface.DEFAULT is set
TextView inflation for unsupported font in XML
  No Exception: Typeface.DEFAULT is set
TextView inflation for unsupported font from provider
  No Exception: Typeface.DEFAULT is set

Bug: 127714175
Test: Manually done
Change-Id: Iaab037f4168546409ead67ed8eee7340418418ed
2019-03-20 10:22:55 -07:00
TreeHugger Robot
f7c5693f7d Merge "Launch ConfirmDeviceCredentials on a new task stack" 2019-03-20 17:21:58 +00:00
Zimuzo Ezeozue
1c6c5dece8 Merge "Fix flaky RollbackTest#testBadUpdateRollback" 2019-03-20 17:21:20 +00:00
shafik
74fec184ac Refine broadcast in commitRollback
Silence qualified user warning by using sendBroadcastAsUser.
The user is UserHandle.SYSTEM.
Limit recievers to those holding MANAGE_ROLLBACKS permission.

Test: warning does not appear in logcat when running atest RollbackTest
Fixes: 128280826
Change-Id: I85b905d2b20f3993859ec87948f309c1934a4a26
2019-03-20 17:05:47 +00:00
TreeHugger Robot
53cc8bf12c Merge "Resources.getSystem docs: not affected by RRO" 2019-03-20 17:05:17 +00:00
TreeHugger Robot
2f39a1ceb1 Merge "Change Display White Balance to track the Planckian locus" 2019-03-20 17:04:06 +00:00
TreeHugger Robot
a2a52be5eb Merge "RRO: remove ability to overlay assets" 2019-03-20 16:49:11 +00:00
TreeHugger Robot
cc17afcec7 Merge "APC: Update the string to warn about the audio capture" 2019-03-20 16:41:22 +00:00
chen xu
2506ceb71e improve mism support for phonestatelistner
1. throw exception if reuse the same listner for different sub
2. subId should come from TM instance not phonestateListener.
3. refactor settings to apply phonestatelistner with TM instances

Bug: 117555407
Test: Manual
Change-Id: I1af07798d7982575cccc27462af179182c033409
(cherry picked from commit 0ebc9b67e9)
Merged-in: I1af07798d7982575cccc27462af179182c033409
2019-03-20 09:39:06 -07:00
TreeHugger Robot
fe31bc77ec Merge "Start running small widget test for widget changes." 2019-03-20 16:35:31 +00:00
Alex Salo
4c005528df Merge "Don't start AttentionService if not configured" 2019-03-20 16:20:15 +00:00