OSDN Git Service

android-x86/frameworks-base.git
5 years agoRevert "Update GNSS Batching to use new GnssLocation with elapsed realtime (framework)"
Donghui Han [Thu, 21 Mar 2019 17:41:16 +0000 (17:41 +0000)]
Revert "Update GNSS Batching to use new GnssLocation with elapsed realtime (framework)"

This reverts commit 4ca5e6c596526395dadfc7680d2ebed284b65616.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I75ed57659ec5b847ce630cd4e7e03ab07bd2a3bc

5 years agoUpdate GNSS Batching to use new GnssLocation with elapsed realtime (framework)
Anil Admal [Mon, 18 Mar 2019 22:29:49 +0000 (15:29 -0700)]
Update GNSS Batching to use new GnssLocation with elapsed realtime (framework)

The ElapsedRealTime field was added to the GnssLocation in
gnss@2.0 HAL to additionally report elapsed time since boot.
The IGnssBatchingCallback.hal@1.0 must be extended to use this
new version of GnssLocation so that the location reported in
gnssLocationBatchCb() method includes the ElapsedRealTime field.

Fixes: 128034260
Test: Tested the new GNSS Batching extension using default
      implementation, VTS test, and cuttlefish.

Change-Id: I401ad32a1399ff2a74bca66b1a02daac863c7b9c

5 years agoMerge "Clip transition animations within a task to the task"
Evan Rosky [Wed, 20 Mar 2019 21:18:02 +0000 (21:18 +0000)]
Merge "Clip transition animations within a task to the task"

5 years agoMerge "Add logging for the detailed reason of screen on/off."
TreeHugger Robot [Wed, 20 Mar 2019 21:09:25 +0000 (21:09 +0000)]
Merge "Add logging for the detailed reason of screen on/off."

5 years agoMerge "Make ImsException final" am: cdc0da732d am: ec6bf56d64
Brad Ebinger [Wed, 20 Mar 2019 20:53:13 +0000 (13:53 -0700)]
Merge "Make ImsException final" am: cdc0da732d am: ec6bf56d64
am: 89a9462bfa

Change-Id: I71956dd999c8ec4be67bb6d58e1a1c3101e7c2b8

5 years agoMerge "Persists LocusId for Shortcuts."
Adam He [Wed, 20 Mar 2019 20:42:57 +0000 (20:42 +0000)]
Merge "Persists LocusId for Shortcuts."

5 years agoMerge "New autofill cmds to enable / disable / check default augmented service."
TreeHugger Robot [Wed, 20 Mar 2019 20:42:06 +0000 (20:42 +0000)]
Merge "New autofill cmds to enable / disable / check default augmented service."

5 years agoMerge "Make ImsException final" am: cdc0da732d
Brad Ebinger [Wed, 20 Mar 2019 20:39:29 +0000 (13:39 -0700)]
Merge "Make ImsException final" am: cdc0da732d
am: ec6bf56d64

Change-Id: I21066c2da0f05fdb0fd7b34744d173ab9a63a43d

5 years agoMerge "Make ImsException final"
Brad Ebinger [Wed, 20 Mar 2019 20:29:07 +0000 (13:29 -0700)]
Merge "Make ImsException final"
am: cdc0da732d

Change-Id: Ic2aafb555b69398852409fc80f6ace5f0f92d1dc

5 years agoMerge "OMS: expose getOverlayInfo API"
Todd Kennedy [Wed, 20 Mar 2019 20:15:48 +0000 (20:15 +0000)]
Merge "OMS: expose getOverlayInfo API"

5 years agoMerge "Make PackageKetSetData use erase"
TreeHugger Robot [Wed, 20 Mar 2019 20:14:34 +0000 (20:14 +0000)]
Merge "Make PackageKetSetData use erase"

5 years agoMerge "RRO: Flag ApplicationInfo if it's an RRO"
TreeHugger Robot [Wed, 20 Mar 2019 20:13:44 +0000 (20:13 +0000)]
Merge "RRO: Flag ApplicationInfo if it's an RRO"

5 years agoMerge "Revive the old behavior of unsupported filed in public APIs"
TreeHugger Robot [Wed, 20 Mar 2019 20:11:14 +0000 (20:11 +0000)]
Merge "Revive the old behavior of unsupported filed in public APIs"

5 years agoMerge "Make ImsException final"
Brad Ebinger [Wed, 20 Mar 2019 20:10:32 +0000 (20:10 +0000)]
Merge "Make ImsException final"

5 years agoMerge "Annotate ODI_CAPTIONS_ENABLED with @SystemApi"
Nadav Bar [Wed, 20 Mar 2019 19:32:06 +0000 (19:32 +0000)]
Merge "Annotate ODI_CAPTIONS_ENABLED with @SystemApi"

5 years agoMerge "Merge "Remove telephony-common classes." am: 6d77176920 am: bfed6db4e1 am...
Android Build Merger (Role) [Wed, 20 Mar 2019 19:19:27 +0000 (19:19 +0000)]
Merge "Merge "Remove telephony-common classes." am: 6d77176920 am: bfed6db4e1 am: 76ff86d56a"

5 years agoMerge "Remove telephony-common classes." am: 6d77176920 am: bfed6db4e1
Steven Moreland [Wed, 20 Mar 2019 19:18:23 +0000 (12:18 -0700)]
Merge "Remove telephony-common classes." am: 6d77176920 am: bfed6db4e1
am: 76ff86d56a

Change-Id: I43a4022c8c6f723098643faaa21e4b3f63ebf96c

5 years agoMerge "Add IRNSS to GnssConstellationType (framework)"
TreeHugger Robot [Wed, 20 Mar 2019 19:18:21 +0000 (19:18 +0000)]
Merge "Add IRNSS to GnssConstellationType (framework)"

5 years agoMerge "Remove interface for Storage."
Matt Pape [Wed, 20 Mar 2019 19:15:52 +0000 (19:15 +0000)]
Merge "Remove interface for Storage."

5 years agoMerge "Refine broadcast in commitRollback"
TreeHugger Robot [Wed, 20 Mar 2019 19:12:02 +0000 (19:12 +0000)]
Merge "Refine broadcast in commitRollback"

5 years agoMerge "Fixed logic on update()."
TreeHugger Robot [Wed, 20 Mar 2019 19:08:31 +0000 (19:08 +0000)]
Merge "Fixed logic on update()."

5 years agoMerge "Remove telephony-common classes." am: 6d77176920
Steven Moreland [Wed, 20 Mar 2019 19:05:41 +0000 (12:05 -0700)]
Merge "Remove telephony-common classes." am: 6d77176920
am: bfed6db4e1

Change-Id: Ib93ef0ac42a5a67acb5e9ca6d85b4fd6ba065f8c

5 years ago[automerger skipped] Merge "[API feedback] fixed API for NR" am: 7afba9e583 am: ffddf...
Pengquan Meng [Wed, 20 Mar 2019 19:02:24 +0000 (12:02 -0700)]
[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

5 years agoMerge "[API feedback] fixed API for NR" am: 7afba9e583
Pengquan Meng [Wed, 20 Mar 2019 18:52:27 +0000 (11:52 -0700)]
Merge "[API feedback] fixed API for NR" am: 7afba9e583
am: ffddf67508

Change-Id: Ic3d7bf6773c61b8f738164e6a41ea616dd0286ac

5 years agoMerge "Remove battery icon from BT combined icon"
TreeHugger Robot [Wed, 20 Mar 2019 18:51:28 +0000 (18:51 +0000)]
Merge "Remove battery icon from BT combined icon"

5 years agoMerge "Remove telephony-common classes."
Steven Moreland [Wed, 20 Mar 2019 18:46:35 +0000 (11:46 -0700)]
Merge "Remove telephony-common classes."
am: 6d77176920

Change-Id: I04c352cc56f66b06142c9a94f0b7ca7d51b26195

5 years agoMerge "[API feedback] fixed API for NR"
Pengquan Meng [Wed, 20 Mar 2019 18:42:00 +0000 (11:42 -0700)]
Merge "[API feedback] fixed API for NR"
am: 7afba9e583

Change-Id: I703b745d276171f57092668d502441d45ae6ded6

5 years agoMerge "pm: SharedLibraryInfo: toString closing bracket" am: 05a8e0b44c am: 48b058ef41
Steven Moreland [Wed, 20 Mar 2019 18:41:23 +0000 (11:41 -0700)]
Merge "pm: SharedLibraryInfo: toString closing bracket" am: 05a8e0b44c am: 48b058ef41
am: c56862250d

Change-Id: I65675ef168b7c0a17cf0598ad2124e978ad8131c

5 years agoMerge "Fix idmap enforce overlayable bug"
TreeHugger Robot [Wed, 20 Mar 2019 18:33:36 +0000 (18:33 +0000)]
Merge "Fix idmap enforce overlayable bug"

5 years agoMerge "AAPT2: Delete unused method parameter"
TreeHugger Robot [Wed, 20 Mar 2019 18:33:06 +0000 (18:33 +0000)]
Merge "AAPT2: Delete unused method parameter"

5 years agoMerge "Remove telephony-common classes."
Steven Moreland [Wed, 20 Mar 2019 18:30:10 +0000 (18:30 +0000)]
Merge "Remove telephony-common classes."

5 years ago[automerger skipped] Merge "improve mism support for phonestatelistner" am: ed4d220c9...
Chen Xu [Wed, 20 Mar 2019 18:25:26 +0000 (11:25 -0700)]
[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

5 years agoMerge "pm: SharedLibraryInfo: toString closing bracket" am: 05a8e0b44c
Steven Moreland [Wed, 20 Mar 2019 18:22:29 +0000 (11:22 -0700)]
Merge "pm: SharedLibraryInfo: toString closing bracket" am: 05a8e0b44c
am: 48b058ef41

Change-Id: Ib7d2078a0f995a8d6a1ba7ea39dd6e1dd5ea0963

5 years agoMerge "[API feedback] fixed API for NR"
Pengquan Meng [Wed, 20 Mar 2019 18:22:16 +0000 (18:22 +0000)]
Merge "[API feedback] fixed API for NR"

5 years agoMerge "[Magnifier-80] Make API getters relative to window"
TreeHugger Robot [Wed, 20 Mar 2019 18:20:36 +0000 (18:20 +0000)]
Merge "[Magnifier-80] Make API getters relative to window"

5 years ago[API feedback] fixed API for NR
Pengquan Meng [Mon, 11 Mar 2019 18:12:58 +0000 (11:12 -0700)]
[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

5 years agoMerge "improve mism support for phonestatelistner" am: ed4d220c97
Chen Xu [Wed, 20 Mar 2019 18:12:32 +0000 (11:12 -0700)]
Merge "improve mism support for phonestatelistner" am: ed4d220c97
am: a05023c222

Change-Id: Icaade79b765a2c27bcf203f40a095b50d2087763

5 years agoMerge "pm: SharedLibraryInfo: toString closing bracket"
Steven Moreland [Wed, 20 Mar 2019 18:06:08 +0000 (11:06 -0700)]
Merge "pm: SharedLibraryInfo: toString closing bracket"
am: 05a8e0b44c

Change-Id: I373baed1fdd987bef7dafdbabacb86a0ef6cfbc0

5 years agoMerge "Added manifest metadata to define the content capture settings activity."
Felipe Leme [Wed, 20 Mar 2019 18:04:06 +0000 (18:04 +0000)]
Merge "Added manifest metadata to define the content capture settings activity."

5 years agoMerge "improve mism support for phonestatelistner"
Chen Xu [Wed, 20 Mar 2019 17:55:57 +0000 (10:55 -0700)]
Merge "improve mism support for phonestatelistner"
am: ed4d220c97

Change-Id: If09726fbd0bf82fdbe2da884d97d9b78089eb1ac

5 years agoMerge "pm: SharedLibraryInfo: toString closing bracket"
Treehugger Robot [Wed, 20 Mar 2019 17:51:00 +0000 (17:51 +0000)]
Merge "pm: SharedLibraryInfo: toString closing bracket"

5 years agoMerge "MediaFormat: add a key for B frames"
Wonsik Kim [Wed, 20 Mar 2019 17:38:28 +0000 (17:38 +0000)]
Merge "MediaFormat: add a key for B frames"

5 years agoAdd logging for the detailed reason of screen on/off.
Steven Wu [Tue, 12 Mar 2019 21:13:14 +0000 (17:13 -0400)]
Add logging for the detailed reason of screen on/off.

Bug: 128437652
Test: manual
Change-Id: If5c281f80b6fce5291bb32eddd2ee7522bd19bb1

5 years agoMerge "improve mism support for phonestatelistner"
Chen Xu [Wed, 20 Mar 2019 17:32:37 +0000 (17:32 +0000)]
Merge "improve mism support for phonestatelistner"

5 years agoRevive the old behavior of unsupported filed in public APIs
Seigo Nonaka [Wed, 20 Mar 2019 17:07:08 +0000 (10:07 -0700)]
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

5 years agoMerge "Launch ConfirmDeviceCredentials on a new task stack"
TreeHugger Robot [Wed, 20 Mar 2019 17:21:58 +0000 (17:21 +0000)]
Merge "Launch ConfirmDeviceCredentials on a new task stack"

5 years agoMerge "Fix flaky RollbackTest#testBadUpdateRollback"
Zimuzo Ezeozue [Wed, 20 Mar 2019 17:21:20 +0000 (17:21 +0000)]
Merge "Fix flaky RollbackTest#testBadUpdateRollback"

5 years agoRefine broadcast in commitRollback
shafik [Thu, 14 Mar 2019 16:29:48 +0000 (16:29 +0000)]
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

5 years agoMerge "Resources.getSystem docs: not affected by RRO"
TreeHugger Robot [Wed, 20 Mar 2019 17:05:17 +0000 (17:05 +0000)]
Merge "Resources.getSystem docs: not affected by RRO"

5 years agoMerge "Change Display White Balance to track the Planckian locus"
TreeHugger Robot [Wed, 20 Mar 2019 17:04:06 +0000 (17:04 +0000)]
Merge "Change Display White Balance to track the Planckian locus"

5 years agoMerge "RRO: remove ability to overlay assets"
TreeHugger Robot [Wed, 20 Mar 2019 16:49:11 +0000 (16:49 +0000)]
Merge "RRO: remove ability to overlay assets"

5 years agoMerge "APC: Update the string to warn about the audio capture"
TreeHugger Robot [Wed, 20 Mar 2019 16:41:22 +0000 (16:41 +0000)]
Merge "APC: Update the string to warn about the audio capture"

5 years agoimprove mism support for phonestatelistner
chen xu [Sun, 17 Mar 2019 07:50:56 +0000 (00:50 -0700)]
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 0ebc9b67e96d0c4a625837ce7a32dbea4afa44ab)
Merged-in: I1af07798d7982575cccc27462af179182c033409

5 years agoMerge "Start running small widget test for widget changes."
TreeHugger Robot [Wed, 20 Mar 2019 16:35:31 +0000 (16:35 +0000)]
Merge "Start running small widget test for widget changes."

5 years agoMerge "Don't start AttentionService if not configured"
Alex Salo [Wed, 20 Mar 2019 16:20:15 +0000 (16:20 +0000)]
Merge "Don't start AttentionService if not configured"

5 years ago[Magnifier-80] Make API getters relative to window
Mihai Popa [Mon, 18 Feb 2019 15:17:09 +0000 (15:17 +0000)]
[Magnifier-80] Make API getters relative to window

The CL updates Magnifier#getPosition() and Magnifier#getSourcePosition()
to return coordinates relative to the main application window, rather
than relative to the surface backing it. Working with window relative
coordinates is the better approach for public APIs. The CL also makes
View#getLocationInSurface public. Magnifier CTS tests still need it,
when testing MAX_IN_SURFACE behavior.

Bug: 124012182
Test: atest CtsWidgetTestCases:android.widget.cts.MagnifierTest
Change-Id: I684f27aa466e0390c7801b616331f4682784c423

5 years agoMerge "Disable DB wipe check"
Makoto Onuki [Wed, 20 Mar 2019 16:03:59 +0000 (16:03 +0000)]
Merge "Disable DB wipe check"

5 years agoMerge "Add code sample and result image for LineHeightSpan"
TreeHugger Robot [Wed, 20 Mar 2019 16:01:50 +0000 (16:01 +0000)]
Merge "Add code sample and result image for LineHeightSpan"

5 years agoMerge "Use system theme for screen recording dialog"
Beth Thibodeau [Wed, 20 Mar 2019 16:00:26 +0000 (16:00 +0000)]
Merge "Use system theme for screen recording dialog"

5 years agoAdded manifest metadata to define the content capture settings activity.
Felipe Leme [Tue, 19 Mar 2019 23:54:55 +0000 (16:54 -0700)]
Added manifest metadata to define the content capture settings activity.

Test: m update-api
Test: mmm frameworks/base/:doc-comment-check-docs
Test: adb shell dumpsys content_capture
Test: CtsContentCaptureServiceTestCases

Bug: 119264902

Change-Id: I656c50d9a45f68312898c8857572d5fe3f55c193

5 years agoMerge "Gestures: Assemble per-window exclusion zones"
Adrian Roos [Wed, 20 Mar 2019 15:28:03 +0000 (15:28 +0000)]
Merge "Gestures: Assemble per-window exclusion zones"

5 years agoMerge "[wv-docs] Document force dark default, and behaviour of FORCE_DARK_AUTO"
Toby Sargeant [Wed, 20 Mar 2019 15:11:10 +0000 (15:11 +0000)]
Merge "[wv-docs] Document force dark default, and behaviour of FORCE_DARK_AUTO"

5 years agoMerge "Ensure activity display with an empty stack can be released"
Louis Chang [Wed, 20 Mar 2019 14:45:50 +0000 (14:45 +0000)]
Merge "Ensure activity display with an empty stack can be released"

5 years agoMerge "Forget about staged installs that are old or in a terminal state."
Gavin Corkery [Wed, 20 Mar 2019 14:40:40 +0000 (14:40 +0000)]
Merge "Forget about staged installs that are old or in a terminal state."

5 years agoFix flaky RollbackTest#testBadUpdateRollback
Zimuzo [Wed, 20 Mar 2019 14:16:41 +0000 (14:16 +0000)]
Fix flaky RollbackTest#testBadUpdateRollback

Added wait for ACTION_ROLLBACK_COMMITTED and also
minor RollbackTestUtils refactoring.

Test: atest RollbackTest
Bug: 126497394
Change-Id: Ia31b98974733ea19cd73c2688971ea853834e195

5 years agoMerge "New ContentCapture constant: ActivityEvent.TYPE_ACTIVITY_DESTROYED"
Felipe Leme [Wed, 20 Mar 2019 14:33:21 +0000 (14:33 +0000)]
Merge "New ContentCapture constant: ActivityEvent.TYPE_ACTIVITY_DESTROYED"

5 years agoAnnotate ODI_CAPTIONS_ENABLED with @SystemApi
danielle cohen [Wed, 20 Mar 2019 13:32:51 +0000 (15:32 +0200)]
Annotate ODI_CAPTIONS_ENABLED with @SystemApi

Test: none
Bug: 128974602
Change-Id: I46a339819c86bef0925873025ca3cf59cd968081

5 years agoMerge "idmap2: move commands to Result<Unit>"
TreeHugger Robot [Wed, 20 Mar 2019 13:58:07 +0000 (13:58 +0000)]
Merge "idmap2: move commands to Result<Unit>"

5 years agoRRO: Flag ApplicationInfo if it's an RRO
Zoran Jovanovic [Sun, 17 Feb 2019 21:02:40 +0000 (22:02 +0100)]
RRO: Flag ApplicationInfo if it's an RRO

This is important when deciding whether or not to create
a hidden app detail activity or within AppInfo in Settings
application.

Bug: 119440359
Bug: 124556507
Test: build and test with Settings app
Change-Id: I02324e5c0a146f4df4cc4a5b1b62059bc9153d23

5 years agoMerge "Add notification opPkg to logs"
Julia Reynolds [Wed, 20 Mar 2019 12:36:37 +0000 (12:36 +0000)]
Merge "Add notification opPkg to logs"

5 years agoMerge "Revert "Add Foldable feature flag""
TreeHugger Robot [Wed, 20 Mar 2019 12:22:17 +0000 (12:22 +0000)]
Merge "Revert "Add Foldable feature flag""

5 years agoRevert "Add Foldable feature flag"
Sam Lin [Wed, 20 Mar 2019 04:05:03 +0000 (04:05 +0000)]
Revert "Add Foldable feature flag"

This reverts commit 821f43aa64a32a608883db8ae25c78a59631ce6d.

Reason for revert: better fit:
- restrict the Package Manager feature flags to features for which the app developer would need to "target"
- typically hardware types should be mutually exclusive to each other

Bug: 124406307
Test: make checkbuild
Change-Id: Ie247a21eb8bbc83efad833ca8db675fd11e7ea4e

5 years ago[wv-docs] Document force dark default, and behaviour of FORCE_DARK_AUTO
Tobias Sargeant [Tue, 19 Mar 2019 12:16:22 +0000 (12:16 +0000)]
[wv-docs] Document force dark default, and behaviour of FORCE_DARK_AUTO

This adds a reference to the View method that controls framework force
dark, which impacts how FORCE_DARK_AUTO is interpreted. It also
documents that FORCE_DARK_AUTO is the default.

Test: documentation only change
Fixes: 128704481
Change-Id: I88e7996362da5b092b269c313e37ef9253b12872

5 years ago[automerger skipped] Merge changes from topic "framework-no-networkstack-aidl" am...
Lorenzo Colitti [Wed, 20 Mar 2019 11:03:21 +0000 (04:03 -0700)]
[automerger skipped] Merge changes from topic "framework-no-networkstack-aidl" am: 74867d1661 am: be2028471f
am: ed6c130647 -s ours
am skip reason: change_id I74531ef11d504b232d4f377532d5e0812dbc88db with SHA1 59d474b3c2 is in history

Change-Id: I694f5e54fba6ddc7a9f486b09ddaeaf54d50e9d1

5 years ago[automerger skipped] Move TcpKeepalivePacketData out of the framework. am: a3f811a547...
Lorenzo Colitti [Wed, 20 Mar 2019 10:55:40 +0000 (03:55 -0700)]
[automerger skipped] Move TcpKeepalivePacketData out of the framework. am: a3f811a547 am: bc1d9ded1a
am: aa597216e3 -s ours
am skip reason: change_id Ib2805f7fcc516a5f6989c252365d1c95b8042703 with SHA1 27e59c575c is in history

Change-Id: I844cf9813437afda3c835b087607a5ef2b38dc42

5 years ago[automerger skipped] Stop using netd parcelables in the framework. am: b90ad24f99...
Lorenzo Colitti [Wed, 20 Mar 2019 10:49:36 +0000 (03:49 -0700)]
[automerger skipped] Stop using netd parcelables in the framework. am: b90ad24f99 am: faa074ebbe
am: d5d9507572 -s ours
am skip reason: change_id I027d50ba56091f5558f45e6e08f32e5912b2a82a with SHA1 cc7f1db970 is in history

Change-Id: Iafb073f81f528a0bf3ec750a348ea7ada190e245

5 years agoMerge changes from topic "framework-no-networkstack-aidl" am: 74867d1661
Lorenzo Colitti [Wed, 20 Mar 2019 10:38:52 +0000 (03:38 -0700)]
Merge changes from topic "framework-no-networkstack-aidl" am: 74867d1661
am: be2028471f

Change-Id: Ie5e1e5fce574ca993b1ec2a998f49f9201c59b4d

5 years agoMove TcpKeepalivePacketData out of the framework. am: a3f811a547
Lorenzo Colitti [Wed, 20 Mar 2019 10:32:50 +0000 (03:32 -0700)]
Move TcpKeepalivePacketData out of the framework. am: a3f811a547
am: bc1d9ded1a

Change-Id: I5f90bdf3993c472f5564164e17106d2a59233656

5 years agoStop using netd parcelables in the framework. am: b90ad24f99
Lorenzo Colitti [Wed, 20 Mar 2019 10:28:08 +0000 (03:28 -0700)]
Stop using netd parcelables in the framework. am: b90ad24f99
am: faa074ebbe

Change-Id: I5a8e45d669f36dfdc67b9f9533d0ff6a24e8f27c

5 years agoMerge changes from topic "framework-no-networkstack-aidl"
Lorenzo Colitti [Wed, 20 Mar 2019 10:18:47 +0000 (03:18 -0700)]
Merge changes from topic "framework-no-networkstack-aidl"
am: 74867d1661

Change-Id: I13ba3cb016a63353cfa62a61106d16e30eff0076

5 years agoMerge "Require a foreground service of a specific type to start media projection."
Narayan Kamath [Wed, 20 Mar 2019 10:18:05 +0000 (10:18 +0000)]
Merge "Require a foreground service of a specific type to start media projection."

5 years agoMove TcpKeepalivePacketData out of the framework.
Lorenzo Colitti [Wed, 20 Mar 2019 10:11:11 +0000 (03:11 -0700)]
Move TcpKeepalivePacketData out of the framework.
am: a3f811a547

Change-Id: I7657e6827299ad398bc16bc792150fd901226b4d

5 years agoStop using netd parcelables in the framework.
Lorenzo Colitti [Wed, 20 Mar 2019 10:03:27 +0000 (03:03 -0700)]
Stop using netd parcelables in the framework.
am: b90ad24f99

Change-Id: Ic4ac445c582ff8b55d253d99de6750d250e9d9e5

5 years agoMerge changes from topic "framework-no-networkstack-aidl"
Lorenzo Colitti [Wed, 20 Mar 2019 09:45:37 +0000 (09:45 +0000)]
Merge changes from topic "framework-no-networkstack-aidl"

* changes:
  Remove the framework dependency on netd_aidl_parcelables-java.
  Move TcpKeepalivePacketData out of the framework.
  Stop using netd parcelables in the framework.

5 years agoMerge "Only allow rollback to be enabled on modules."
Richard Uhler [Wed, 20 Mar 2019 09:40:13 +0000 (09:40 +0000)]
Merge "Only allow rollback to be enabled on modules."

5 years agoMerge "Grant record audio permission to SystemCaptionsService instead of ContentCaptu...
Nadav Bar [Wed, 20 Mar 2019 08:00:52 +0000 (08:00 +0000)]
Merge "Grant record audio permission to SystemCaptionsService instead of ContentCaptureService"

5 years agoMerge "Fix the problem of CaptivePortalLogin app cannot show SSL error page" am:...
Lucas Lin [Wed, 20 Mar 2019 07:41:19 +0000 (00:41 -0700)]
Merge "Fix the problem of CaptivePortalLogin app cannot show SSL error page" am: 1a80ff943d am: 4e7830d866
am: 0f05c2a7c1

Change-Id: I6e0b3c5ab67449d11b1e4c0be0d16c322ae380f0

5 years agoMerge "[automerger skipped] Merge "Renamed NetworkRegistrationState to NetworkRegistr...
Android Build Merger (Role) [Wed, 20 Mar 2019 07:27:23 +0000 (07:27 +0000)]
Merge "[automerger skipped] Merge "Renamed NetworkRegistrationState to NetworkRegistrationInfo" am: 936c536bba am: 55e73c27a8 am: dc025370cd -s ours am skip reason: change_id I8af36b388182ab08257b64c37078f156d4821709 with SHA1 e27d3fde88 is in history"

5 years ago[automerger skipped] Merge "Renamed NetworkRegistrationState to NetworkRegistrationIn...
Jack Yu [Wed, 20 Mar 2019 07:25:29 +0000 (00:25 -0700)]
[automerger skipped] Merge "Renamed NetworkRegistrationState to NetworkRegistrationInfo" am: 936c536bba am: 55e73c27a8
am: dc025370cd -s ours
am skip reason: change_id I8af36b388182ab08257b64c37078f156d4821709 with SHA1 e27d3fde88 is in history

Change-Id: I15947c878571752d578b65813a1592487155d8ed

5 years agoMerge "Bubble expanded view - update header color on uimode and overlay change"
TreeHugger Robot [Wed, 20 Mar 2019 07:20:42 +0000 (07:20 +0000)]
Merge "Bubble expanded view - update header color on uimode and overlay change"

5 years agoMerge "Fix the problem of CaptivePortalLogin app cannot show SSL error page" am:...
Lucas Lin [Wed, 20 Mar 2019 07:15:35 +0000 (00:15 -0700)]
Merge "Fix the problem of CaptivePortalLogin app cannot show SSL error page" am: 1a80ff943d
am: 4e7830d866

Change-Id: I6a14e5e1ddbf6346e90c98b324a1760b0e3e8227

5 years agoMerge "Fix the problem of CaptivePortalLogin app cannot show SSL error page"
Lucas Lin [Wed, 20 Mar 2019 07:07:59 +0000 (00:07 -0700)]
Merge "Fix the problem of CaptivePortalLogin app cannot show SSL error page"
am: 1a80ff943d

Change-Id: Ief7b9c8f172fa3ad5a1143d998d455797c1bf937

5 years agoMerge "Renamed NetworkRegistrationState to NetworkRegistrationInfo" am: 936c536bba
Jack Yu [Wed, 20 Mar 2019 07:03:39 +0000 (00:03 -0700)]
Merge "Renamed NetworkRegistrationState to NetworkRegistrationInfo" am: 936c536bba
am: 55e73c27a8

Change-Id: I84a8dcfbfad1e9d2b8b342f1f4cce9d8c9a4c69d

5 years agoMerge "Add metrics constants / enums for removal dialog"
Kevin Chyn [Wed, 20 Mar 2019 07:01:52 +0000 (07:01 +0000)]
Merge "Add metrics constants / enums for removal dialog"

5 years agoMerge "Fix TextureView glitch and memory leak"
TreeHugger Robot [Wed, 20 Mar 2019 07:00:25 +0000 (07:00 +0000)]
Merge "Fix TextureView glitch and memory leak"

5 years agoMerge "Fix the problem of CaptivePortalLogin app cannot show SSL error page"
Lucas Lin [Wed, 20 Mar 2019 06:53:26 +0000 (06:53 +0000)]
Merge "Fix the problem of CaptivePortalLogin app cannot show SSL error page"

5 years agoMerge "Use updated DeviceConfig API's new getters to simplify invocations."
TreeHugger Robot [Wed, 20 Mar 2019 06:50:15 +0000 (06:50 +0000)]
Merge "Use updated DeviceConfig API's new getters to simplify invocations."

5 years agoMerge "Renamed NetworkRegistrationState to NetworkRegistrationInfo"
Jack Yu [Wed, 20 Mar 2019 06:42:34 +0000 (23:42 -0700)]
Merge "Renamed NetworkRegistrationState to NetworkRegistrationInfo"
am: 936c536bba

Change-Id: I8142e09fbee353c95a4b429e8d1bc7365aa5863e

5 years agoMerge "Better description and parameter name of setPreferredDataSubscriptionId"
Xiangyu/Malcolm Chen [Wed, 20 Mar 2019 06:41:26 +0000 (06:41 +0000)]
Merge "Better description and parameter name of setPreferredDataSubscriptionId"

5 years agoMerge "Add javadoc for link to valid SessionCommand values"
Jin Seok Park [Wed, 20 Mar 2019 06:35:20 +0000 (06:35 +0000)]
Merge "Add javadoc for link to valid SessionCommand values"