OSDN Git Service

android-x86/frameworks-base.git
6 years ago[Magnifier-25] Fix race condition after #dismiss
Mihai Popa [Thu, 22 Feb 2018 19:30:24 +0000 (19:30 +0000)]
[Magnifier-25] Fix race condition after #dismiss

The CL adds synchronization around the InternalPopupWindow instance
used, between the main thread and the thread that handles pixel copy
results. This comes to fix a potential null pointer exception that
might occur after a #dismiss().

Bug: 73765118
Test: atest CtsWidgetTestCases:android.widget.cts.MagnifierTest
Change-Id: I8a8feb02f3ee418597ce3eee50db77b4b67e462e

6 years agoMerge "Fixed issue with relaunching activity in the stopped state"
Wale Ogunwale [Thu, 22 Feb 2018 17:20:44 +0000 (17:20 +0000)]
Merge "Fixed issue with relaunching activity in the stopped state"

6 years agoMerge "Factor out telephony permission checks into a helper class."
Jeff Davidson [Thu, 22 Feb 2018 16:48:53 +0000 (16:48 +0000)]
Merge "Factor out telephony permission checks into a helper class."

6 years agoMerge "New small volume dialog"
TreeHugger Robot [Thu, 22 Feb 2018 16:41:31 +0000 (16:41 +0000)]
Merge "New small volume dialog"

6 years agoMerge "Remove package name parameter from setRecoveryStatus"
Robert Berry [Thu, 22 Feb 2018 16:40:12 +0000 (16:40 +0000)]
Merge "Remove package name parameter from setRecoveryStatus"

6 years agoMerge "Implement UNLIMITED_SHORTCUTS_API_CALLS permission."
Makoto Onuki [Thu, 22 Feb 2018 16:37:30 +0000 (16:37 +0000)]
Merge "Implement UNLIMITED_SHORTCUTS_API_CALLS permission."

6 years agoMerge changes I8e432950,Id325b8cf am: 919ff2268b am: 9eec0a5c0e
Paul Duffin [Thu, 22 Feb 2018 16:27:28 +0000 (16:27 +0000)]
Merge changes I8e432950,Id325b8cf am: 919ff2268b am: 9eec0a5c0e
am: cb77fb7c9a  -s ours

Change-Id: I2625d4a671a6a50f99ab99ffd72b96b83c601538

6 years agoMerge "Fix task animations"
Jorim Jaggi [Thu, 22 Feb 2018 16:13:44 +0000 (16:13 +0000)]
Merge "Fix task animations"

6 years agoMerge "Add ability to show wallpaper during animation"
Jorim Jaggi [Thu, 22 Feb 2018 16:10:56 +0000 (16:10 +0000)]
Merge "Add ability to show wallpaper during animation"

6 years agoMerge "Make default entity lists flag configurable"
TreeHugger Robot [Thu, 22 Feb 2018 16:08:51 +0000 (16:08 +0000)]
Merge "Make default entity lists flag configurable"

6 years agoMerge "Package whitelist for hiddenapi checks." am: 9a50d75795 am: 3d2a3e25d3
Mathew Inwood [Thu, 22 Feb 2018 16:02:50 +0000 (16:02 +0000)]
Merge "Package whitelist for hiddenapi checks." am: 9a50d75795 am: 3d2a3e25d3
am: 60b6925bdb  -s ours

Change-Id: Icc96c28fd9289268398c71f82ac83038a606550d

6 years agoMerge "Cleanup TelephonyManager's log" am: 033de4676b am: 22f61111bd
Pengquan Meng [Thu, 22 Feb 2018 15:53:27 +0000 (15:53 +0000)]
Merge "Cleanup TelephonyManager's log" am: 033de4676b am: 22f61111bd
am: bfb00f97af

Change-Id: Iccc3d497bf28906f4da54eef3acbd72dc04bfd3c

6 years agoMerge "EMBMS API tweaks" am: 47e1d11b47 am: 3b40c709a3
Hall Liu [Thu, 22 Feb 2018 15:38:26 +0000 (15:38 +0000)]
Merge "EMBMS API tweaks" am: 47e1d11b47 am: 3b40c709a3
am: 2a08ccdd8b

Change-Id: I617e2bca44d52b55f2d032db0fe59aa0a9f88e24

6 years agoMerge changes I8e432950,Id325b8cf am: 919ff2268b
Paul Duffin [Thu, 22 Feb 2018 15:26:08 +0000 (15:26 +0000)]
Merge changes I8e432950,Id325b8cf am: 919ff2268b
am: 9eec0a5c0e

Change-Id: Ie067d44d602ecaf13fd5ea1101b87807193733e9

6 years agoMerge changes I8e432950,Id325b8cf
Paul Duffin [Thu, 22 Feb 2018 15:16:30 +0000 (15:16 +0000)]
Merge changes I8e432950,Id325b8cf
am: 919ff2268b

Change-Id: I0912e9a426a5cc72e67b3ec55e2bbe195079eaf6

6 years agoMerge "Build android.test.runner and its variants with SDK"
TreeHugger Robot [Thu, 22 Feb 2018 15:14:38 +0000 (15:14 +0000)]
Merge "Build android.test.runner and its variants with SDK"

6 years agoNew small volume dialog
Julia Reynolds [Wed, 21 Feb 2018 16:41:33 +0000 (11:41 -0500)]
New small volume dialog

- Remove labels
- Remove output chooser dialog
- Reorder icons
- Add settings affordance
- Add instructive toast

Test: manual
Change-Id: I6640fb8147707936fe22e3c756ab29116973fbe3
Fixes: 73719758
Fixes: 73333233
Fixes: 71663761

6 years agoMerge "Docs: small documentation fixes for formatting and typos."
TreeHugger Robot [Thu, 22 Feb 2018 14:36:05 +0000 (14:36 +0000)]
Merge "Docs: small documentation fixes for formatting and typos."

6 years agoMerge "Package whitelist for hiddenapi checks." am: 9a50d75795
Mathew Inwood [Thu, 22 Feb 2018 14:29:23 +0000 (14:29 +0000)]
Merge "Package whitelist for hiddenapi checks." am: 9a50d75795
am: 3d2a3e25d3

Change-Id: I8e0120c77965a3d5784e61c7eabe5a8c4f88b1ea

6 years agoFix task animations
Jorim Jaggi [Wed, 21 Feb 2018 17:46:53 +0000 (18:46 +0100)]
Fix task animations

Sometimes apps are using trampoline activities in the current
task, and then open a new task from that trampoline activity,
which means that the first transition was ACTIVITY_OPEN and that's
what we take at end.

To fix this, we let task animations always override activity
animations.

Test: go/wm-smoke
Test: Open a Docs document from Drive. Open a Chrome link from
Maps.
Fixes: 72710883

Change-Id: I72b6901fdc21514ffca4a47e433d66ea9d3cdb32

6 years agoMerge "Package whitelist for hiddenapi checks."
Mathew Inwood [Thu, 22 Feb 2018 14:11:57 +0000 (14:11 +0000)]
Merge "Package whitelist for hiddenapi checks."
am: 9a50d75795

Change-Id: Iad8ccab4d46677320c9d39f73e6bbc67262c18b2

6 years agoMerge "Update lock task features name and javadoc"
Benjamin Franz [Thu, 22 Feb 2018 14:08:33 +0000 (14:08 +0000)]
Merge "Update lock task features name and javadoc"

6 years agoFixed issue with relaunching activity in the stopped state
Wale Ogunwale [Wed, 21 Feb 2018 02:18:21 +0000 (18:18 -0800)]
Fixed issue with relaunching activity in the stopped state

- Cycle activity back to the stopped state if relaunched while the
activity is in the stopped state.
- Also, process Activity.recreate() request locally. After the
activity life cycler changes/clean-up we no longer need to request
the relaunch from the server since it is much easier now to cycle
the activity back to its previous state without help from the server
side.

Change-Id: Ie63420361a50d3dee2cbbcc2bbd34f3099c93996
Fixes: 64610483
Test: atest CtsActivityManagerDeviceTestCases:ActivityLifecycleTests

6 years agoAdd ability to show wallpaper during animation
Jorim Jaggi [Wed, 21 Feb 2018 16:50:18 +0000 (17:50 +0100)]
Add ability to show wallpaper during animation

In the new task switch animations, we'd like to show the wallpaper
behind. For that, we add the ability to show the wallpaper for
any animation via Animation.showWallpaper as an XML attribute.

If the window of an app is animating, and the animation requests
the wallpaper, it can also be a wallpaper.

One remaning issue here is that we don't wait for the wallpaper
to be drawn when waiting for the transition. However, usually this
isn't an issue because the wallpaper is drawn in any case.

To fix this we'd need to load the animation already and then make
it a target before the animation starts, which is a bit involved
/quirky.

Test: Open/close task, observe wallpaper behind
Test: go/wm-smoke
Bug: 72396815
Change-Id: I676273a4e6627f8b5e0a1366fcd80a7c92018123

6 years agoMerge changes I8e432950,Id325b8cf
Treehugger Robot [Thu, 22 Feb 2018 13:39:10 +0000 (13:39 +0000)]
Merge changes I8e432950,Id325b8cf

* changes:
  Build android.test.base/legacy against SDK
  Fix visibility issues with android.test.mock.stubs

6 years agoMerge "Package whitelist for hiddenapi checks."
Mathew Inwood [Thu, 22 Feb 2018 12:57:48 +0000 (12:57 +0000)]
Merge "Package whitelist for hiddenapi checks."

6 years agoMerge "Add TestApis for updateTransportAttributes GTS tests"
Annie Meng [Thu, 22 Feb 2018 12:22:42 +0000 (12:22 +0000)]
Merge "Add TestApis for updateTransportAttributes GTS tests"

6 years agoMerge changes from topic "magnifier_sync_movement"
Mihai Popa [Thu, 22 Feb 2018 12:03:01 +0000 (12:03 +0000)]
Merge changes from topic "magnifier_sync_movement"

* changes:
  [Magnifier-24] Add completion callback TestApi
  [Magnifier-21] Rate-limit drawings to renderer
  [Magnifier-20] Raw Surface instead of PopupWindow

6 years agoMerge "Update javadoc of PackageInstaller to mention the enterprise bit"
TreeHugger Robot [Thu, 22 Feb 2018 12:02:38 +0000 (12:02 +0000)]
Merge "Update javadoc of PackageInstaller to mention the enterprise bit"

6 years agoMake default entity lists flag configurable
Jan Althaus [Mon, 19 Feb 2018 10:44:37 +0000 (11:44 +0100)]
Make default entity lists flag configurable

Bug: 73277686
Test: bit CtsViewTestCases:android.view.textclassifier.cts
CtsTextTestCases:android.text.util.cts
FrameworksCoreTests:android.view.textclassifier
Change-Id: I84be54fb407088ee25c3ba2d4d62708a898621ad

6 years agoMerge "Adding logging for generateLinks"
TreeHugger Robot [Thu, 22 Feb 2018 11:31:29 +0000 (11:31 +0000)]
Merge "Adding logging for generateLinks"

6 years agoPackage whitelist for hiddenapi checks.
Mathew Inwood [Fri, 16 Feb 2018 11:49:20 +0000 (11:49 +0000)]
Package whitelist for hiddenapi checks.

Some packages in the system image are not built against the SDK, so
enforcing hiddenapi checks for these will break them. Add a whitelist
for such packages.

For now, just add the contacts provider to the whitelist. The list will be
further populated later.

Test: Added test app package name to whitelist to verify.

Bug: 73244707

Merged-In: I94746b7f12dd9371d5068bb235eb853f63ee4d97
Change-Id: I1cbbd220c61b1b4b767c301f97096607ee902a7b

6 years agoRemove package name parameter from setRecoveryStatus
Robert Berry [Tue, 20 Feb 2018 19:47:43 +0000 (19:47 +0000)]
Remove package name parameter from setRecoveryStatus

Package name is implicit. Recovery agent can only act for the same uid.

Bug: 73757432
Test: runtest frameworks-services -p
      com.android.server.locksettings.recoverablekeystore

Change-Id: I45abf4b956fa4e97d981614d9e61295e85d5669e

6 years agoMerge "MediaSessionService: Document necessity of onSessionDestroyed()"
Jaewan Kim [Thu, 22 Feb 2018 09:55:21 +0000 (09:55 +0000)]
Merge "MediaSessionService: Document necessity of onSessionDestroyed()"

6 years agoMerge "Camera: improve Surface equality check"
TreeHugger Robot [Thu, 22 Feb 2018 09:37:57 +0000 (09:37 +0000)]
Merge "Camera: improve Surface equality check"

6 years agoDocs: small documentation fixes for formatting and typos.
Benjamin Miller [Thu, 22 Feb 2018 08:49:21 +0000 (08:49 +0000)]
Docs: small documentation fixes for formatting and typos.

Test: make ds-docs
Bug: 73753042

Change-Id: Iaf8065de45b03a59e1327d3872bb790da276d230

6 years agoMerge "Cleanup TelephonyManager's log" am: 033de4676b
Pengquan Meng [Thu, 22 Feb 2018 07:14:43 +0000 (07:14 +0000)]
Merge "Cleanup TelephonyManager's log" am: 033de4676b
am: 22f61111bd

Change-Id: Icaff0e2cc4ebeb1f36b8597ee11457779aeca06f

6 years agoMerge "Cleanup TelephonyManager's log"
Pengquan Meng [Thu, 22 Feb 2018 07:02:54 +0000 (07:02 +0000)]
Merge "Cleanup TelephonyManager's log"
am: 033de4676b

Change-Id: I808ab4b142afcbf6c752b7f4f24d60500ab1cb51

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 22 Feb 2018 06:40:03 +0000 (06:40 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Add annotation to atoms that represent a state change in atoms.proto"
TreeHugger Robot [Thu, 22 Feb 2018 05:36:45 +0000 (05:36 +0000)]
Merge "Add annotation to atoms that represent a state change in atoms.proto"

6 years agoMerge "Cleanup TelephonyManager's log"
Pengquan Meng [Thu, 22 Feb 2018 05:19:11 +0000 (05:19 +0000)]
Merge "Cleanup TelephonyManager's log"

6 years agoBuild android.test.runner and its variants with SDK
Jiyong Park [Thu, 22 Feb 2018 05:16:35 +0000 (14:16 +0900)]
Build android.test.runner and its variants with SDK

They are not using any private APIs, thus eligible to be built with SDK.

Test: m -j
Change-Id: I82c7e2a739a40d6d2f1488164b25503a8a454b0d

6 years agoMerge "Rename HardwareLayer -> TextureLayer"
TreeHugger Robot [Thu, 22 Feb 2018 04:30:27 +0000 (04:30 +0000)]
Merge "Rename HardwareLayer -> TextureLayer"

6 years agoMerge "WebView: fix docs for setSafeBrowsingWhitelist"
TreeHugger Robot [Thu, 22 Feb 2018 04:08:02 +0000 (04:08 +0000)]
Merge "WebView: fix docs for setSafeBrowsingWhitelist"

6 years agoMerge "Updates the name of the native library wrapper class, adds options and removes...
TreeHugger Robot [Thu, 22 Feb 2018 04:01:25 +0000 (04:01 +0000)]
Merge "Updates the name of the native library wrapper class, adds options and removes hints."

6 years agoMerge "Update rotate suggestion button icon+motion"
Mike Digman [Thu, 22 Feb 2018 03:55:10 +0000 (03:55 +0000)]
Merge "Update rotate suggestion button icon+motion"

6 years agoMerge "EMBMS API tweaks" am: 47e1d11b47
Hall Liu [Thu, 22 Feb 2018 03:54:18 +0000 (03:54 +0000)]
Merge "EMBMS API tweaks" am: 47e1d11b47
am: 3b40c709a3

Change-Id: I8b281f717d3862a9f7a5de3d834dcded4ac436dc

6 years agoMerge "EMBMS API tweaks"
Hall Liu [Thu, 22 Feb 2018 03:36:12 +0000 (03:36 +0000)]
Merge "EMBMS API tweaks"
am: 47e1d11b47

Change-Id: Ie058b45f2dd09b80a51cb9702155e45f49005173

6 years agoMerge "Statsd anomaly output log fix"
TreeHugger Robot [Thu, 22 Feb 2018 03:13:04 +0000 (03:13 +0000)]
Merge "Statsd anomaly output log fix"

6 years agoMerge "Handle window surface insets"
John Reck [Thu, 22 Feb 2018 02:28:40 +0000 (02:28 +0000)]
Merge "Handle window surface insets"

6 years agoMerge "Fix the bug of timestamp encoding in event metric report."
TreeHugger Robot [Thu, 22 Feb 2018 02:17:34 +0000 (02:17 +0000)]
Merge "Fix the bug of timestamp encoding in event metric report."

6 years agoMerge "Add 90th and 95th percentile to ManualBenchmarkState"
TreeHugger Robot [Thu, 22 Feb 2018 02:14:07 +0000 (02:14 +0000)]
Merge "Add 90th and 95th percentile to ManualBenchmarkState"

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 22 Feb 2018 01:35:18 +0000 (17:35 -0800)]
Import translations. DO NOT MERGE

Change-Id: I40b6e489f9b5e97da095ae0d4258de9df1565736
Auto-generated-cl: translation import

6 years agoMerge "Binary Cpu Time Proc File Reader"
TreeHugger Robot [Thu, 22 Feb 2018 01:26:09 +0000 (01:26 +0000)]
Merge "Binary Cpu Time Proc File Reader"

6 years agoMerge "Throttler for incidentd based on size putting into dropbox."
TreeHugger Robot [Thu, 22 Feb 2018 01:11:00 +0000 (01:11 +0000)]
Merge "Throttler for incidentd based on size putting into dropbox."

6 years agoMerge "Fix tests broken in ag/3574286"
Sundeep Ghuman [Thu, 22 Feb 2018 00:55:07 +0000 (00:55 +0000)]
Merge "Fix tests broken in ag/3574286"

6 years agoAdd annotation to atoms that represent a state change in atoms.proto
Yao Chen [Mon, 19 Feb 2018 22:39:19 +0000 (14:39 -0800)]
Add annotation to atoms that represent a state change in atoms.proto

+ A state change atom can have one exclusive state field, and any
  number of primary key fields.

  When there is primary key in the atom, it means the state belongs to the primary key.
  For example,
  message UidProcessStateChanged {
    optional int32 uid = 1 [(stateFieldOption).option = PRIMARY];
    optional android.app.ProcessStateEnum state = 2 [(stateFieldOption).option = EXCLUSIVE];
  }

  When there is no primary key fields in the atom, the state is global.
  For example,
  message ScreenStateChanged {
     optional android.view.DisplayStateEnum state = 1 [(stateFieldOption).option = EXCLUSIVE];
  }

+ The annotation is consumed by stats_log_api_gen to generate a static map from the state
  atoms to its primary fields, and exclusive fields

+ stats_log.proto is splitted into 2 proto files, because statsd needs proto lite, and c++
  lite proto library cannot properly ignore the field options which requires full proto.

 This CL doesn't change any logic in the statsd yet. A separate CL will use the field option
 information to correctly track the state.

Test: added unit tests in stats_log_api_gen_test. and statsd_test pases.
Change-Id: I9e8a979fe81ba60efd4d854bb7087ce4b2b147ec

6 years agoFix tests broken in ag/3574286
Sundeep Ghuman [Wed, 21 Feb 2018 22:17:57 +0000 (14:17 -0800)]
Fix tests broken in ag/3574286

Changes made during review process broke a test, and this was not caught
via presubmits. Fixing now.

Bug: 68030053
Test: runtest --path
              frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java

Change-Id: I7ce84c7cd1653966beb8980250e64a590def7fc9

6 years agoMerge "Merge "Check for location access on TelephonyRegistry" am: 31230bb193 am:...
Android Build Merger (Role) [Thu, 22 Feb 2018 00:44:42 +0000 (00:44 +0000)]
Merge "Merge "Check for location access on TelephonyRegistry" am: 31230bb193 am: f581580fdb am: 9b31dd86da"

6 years agoMerge "Check for location access on TelephonyRegistry" am: 31230bb193 am: f581580fdb
Hall Liu [Thu, 22 Feb 2018 00:43:12 +0000 (00:43 +0000)]
Merge "Check for location access on TelephonyRegistry" am: 31230bb193 am: f581580fdb
am: 9b31dd86da

Change-Id: Icd2feab82a9350fa2b6539617863ad91a44e5208

6 years agoMerge "Add Hearing Aid output device"
TreeHugger Robot [Thu, 22 Feb 2018 00:40:52 +0000 (00:40 +0000)]
Merge "Add Hearing Aid output device"

6 years agoMerge "Fix comment on config_defaultTextClassifierPackage"
Makoto Onuki [Thu, 22 Feb 2018 00:40:32 +0000 (00:40 +0000)]
Merge "Fix comment on config_defaultTextClassifierPackage"

6 years agoMerge "EMBMS API tweaks"
Hall Liu [Thu, 22 Feb 2018 00:35:51 +0000 (00:35 +0000)]
Merge "EMBMS API tweaks"

6 years agoMerge "Merge "Explicitly restart the killed wallpaper service" am: 0780b18a9f am...
Android Build Merger (Role) [Thu, 22 Feb 2018 00:35:04 +0000 (00:35 +0000)]
Merge "Merge "Explicitly restart the killed wallpaper service" am: 0780b18a9f am: 9298af376a am: c5d4747494"

6 years agoMerge "Explicitly restart the killed wallpaper service" am: 0780b18a9f am: 9298af376a
Chris Tate [Thu, 22 Feb 2018 00:34:45 +0000 (00:34 +0000)]
Merge "Explicitly restart the killed wallpaper service" am: 0780b18a9f am: 9298af376a
am: c5d4747494

Change-Id: I6f9d38268320095ba69bfa490fcdf4dadd173fe8

6 years agoMerge "Check for location access on TelephonyRegistry" am: 31230bb193
Hall Liu [Thu, 22 Feb 2018 00:34:03 +0000 (00:34 +0000)]
Merge "Check for location access on TelephonyRegistry" am: 31230bb193
am: f581580fdb

Change-Id: Ic13eacf7dafc96359bd607cb4e2a5c024f9bb607

6 years agoMerge "Handling concurrent location & SV status update"
TreeHugger Robot [Thu, 22 Feb 2018 00:33:42 +0000 (00:33 +0000)]
Merge "Handling concurrent location & SV status update"

6 years agoCamera: improve Surface equality check
Yin-Chia Yeh [Wed, 21 Feb 2018 20:38:19 +0000 (12:38 -0800)]
Camera: improve Surface equality check

Bug: 72134091 73711267
Change-Id: I0d7b42f8621c1fb19ad9645d8b407eb90b05654d

6 years agoMerge "Explicitly restart the killed wallpaper service" am: 0780b18a9f
Chris Tate [Thu, 22 Feb 2018 00:16:40 +0000 (00:16 +0000)]
Merge "Explicitly restart the killed wallpaper service" am: 0780b18a9f
am: 9298af376a

Change-Id: If3cd3217c2d9f42772e0f276c1bc3c1380ac149f

6 years agoMerge "Check for location access on TelephonyRegistry"
Hall Liu [Thu, 22 Feb 2018 00:11:04 +0000 (00:11 +0000)]
Merge "Check for location access on TelephonyRegistry"
am: 31230bb193

Change-Id: I6827b337d9bcc2c634d873e03895c5997cca374c

6 years agoMerge "Explicitly restart the killed wallpaper service"
Chris Tate [Thu, 22 Feb 2018 00:06:25 +0000 (00:06 +0000)]
Merge "Explicitly restart the killed wallpaper service"
am: 0780b18a9f

Change-Id: I7759fc380ef9555cb58f9ab593248e69cd798c70

6 years agoAdd Hearing Aid output device
Jakub Pawlowski [Wed, 21 Feb 2018 19:53:14 +0000 (11:53 -0800)]
Add Hearing Aid output device

This output is used to send audio to Hearring Aid device.

Bug: 69623109
Test: mm
Change-Id: I6ffdb0a404efb645592624612c7ebc187fb933a6

6 years agoRename HardwareLayer -> TextureLayer
John Reck [Wed, 21 Feb 2018 20:55:41 +0000 (12:55 -0800)]
Rename HardwareLayer -> TextureLayer

Update name to reflect meaning/usage

Change-Id: Iddb3621cbca147f96faa83380867baa49c382aab
Fixes: 20461288
Test: builds & boots

6 years agoFactor out telephony permission checks into a helper class.
Jeff Davidson [Wed, 14 Feb 2018 02:11:37 +0000 (18:11 -0800)]
Factor out telephony permission checks into a helper class.

The aim is to cut down on duplicate code (for a particularly high-risk
area) and make it easier to expand READ_PHONE_STATE access to
carrier-privileged apps in a follow-up CL.

No major functional changes are intended, although some logging will
change slightly (different tag / less verbose carrier privilege
logging without DBG flag).

Bug: 70041899
Test: bit FrameworksTelephonyTests:*, nothing visibly broken on boot
Change-Id: I3b2aa9b8d6177a25d532060009508ef31baea69c

6 years agoMerge "Updating AppLaunchWear to correctly parse the launch message."
Kevin Neas [Wed, 21 Feb 2018 23:41:34 +0000 (23:41 +0000)]
Merge "Updating AppLaunchWear to correctly parse the launch message."

6 years agoUpdating AppLaunchWear to correctly parse the launch message.
Kevin Neas [Wed, 21 Feb 2018 23:37:21 +0000 (15:37 -0800)]
Updating AppLaunchWear to correctly parse the launch message.

When we don't kill Home, we get an Warning message:
"Warning: Activity not started, its current task has ben brought to
the front"

This causes the current parser to think the app didn't launch, because
it's looking in the wrong line. Adding +1 to each line, in the cases
where we launch Home

Test: locally
Change-Id: Ie232a57921ed7cf82a6f17b607fbb47591bcdbed

6 years agoMerge "Describe how the accessory input stream drops data"
TreeHugger Robot [Wed, 21 Feb 2018 23:37:28 +0000 (23:37 +0000)]
Merge "Describe how the accessory input stream drops data"

6 years agoUpdates the name of the native library wrapper class, adds options and removes hints.
Lukas Zilka [Wed, 7 Feb 2018 19:30:08 +0000 (20:30 +0100)]
Updates the name of the native library wrapper class, adds options and removes hints.

Test: Built, tested on device, CTS passes.

bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest

Change-Id: I7c70427d28bec8218935ed45a39819b2ece8112a

6 years agoBinary Cpu Time Proc File Reader
Mike Ma [Tue, 13 Feb 2018 22:22:47 +0000 (14:22 -0800)]
Binary Cpu Time Proc File Reader

Kernel now exposes cpu time proc files in binary format to save cpu
cycles. New proc files are:
Per uid freq time: /proc/uid_cpupower/time_in_state
Per uid active time: /proc/uid_cpupower/concurrent_active_time
Per uid cluster time: /proc/uid_cpupower/concurrent_policy_time
(See PowerProfile.java on how these data are used)
KernelUidCpuActiveTimeReader, KernelUidCpuClusterTimeReader and
KernelUidCpuFreqTimeReader are modified to use these new data.

Meanwhile, statsd needs these data too. So the actual reading
fuctionality is delegated to singletons in KernelCpuProcReader to
accomodate concurrent access of these proc files by more than one
party. When multiple read requests hit the singleton within the
throttle interval, the singleton will return stale data.

Optimization
KernelCpuProcReader reuses the same ByteBuffer to save results.
KernelUid***Reader all reuse the same long[] array to send results
back to BatteryStatsImpl. Estimated saving of ~200 KB GC effort
per read request.

Add a flag to control throttle interval:
kernel_uid_readers_throttle_time

Bug: 72763654
Bug: 71906435
Bug: 71905885
Bug: 70517018
Fixes: 73166477
Fixes: 72172569
Test: BatteryStatsCpuTimesTest
Test: KernelUidCpuActiveTimeReaderTest
Test: KernelUidCpuClusterTimeReaderTest
Test: KernelUidCpuFreqTimeReaderTest
Test: KernelCpuProcReaderTest
Change-Id: I1012667ce3b9eb35e37882a058bd4bceccabbbe9

6 years agoMerge "Fix low probability deadlock" am: bb5cbc539f am: e05aa02d59
Xiangyu/Malcolm Chen [Wed, 21 Feb 2018 23:31:31 +0000 (23:31 +0000)]
Merge "Fix low probability deadlock" am: bb5cbc539f am: e05aa02d59
am: 11d3d6b7f7

Change-Id: I65a7d2e32b02386905a384d69f68bab8cde1bf95

6 years agoWebView: fix docs for setSafeBrowsingWhitelist
Nate Fischer [Wed, 21 Feb 2018 23:27:01 +0000 (15:27 -0800)]
WebView: fix docs for setSafeBrowsingWhitelist

No change to logic, documentation change only.

This changes "URL" to "host" everywhere in this API documentation.
This API never accepted a list of URLs, it only ever accepted a list of
hosts (e.g. "www.google.com" is ok, "http://www.google.com/" is not).
The original documentation was misleading.

Test: make docs (manually verify)
Change-Id: I3b57a2a160ff00ba8f92b30f6e3b4399e55f2ea0

6 years agoMerge "Fix low probability deadlock" am: bb5cbc539f
Xiangyu/Malcolm Chen [Wed, 21 Feb 2018 23:15:30 +0000 (23:15 +0000)]
Merge "Fix low probability deadlock" am: bb5cbc539f
am: e05aa02d59

Change-Id: I3560bd28b67fee381f6c2d9e8bc8864efe63090d

6 years agoMerge "Fix low probability deadlock"
Xiangyu/Malcolm Chen [Wed, 21 Feb 2018 23:01:42 +0000 (23:01 +0000)]
Merge "Fix low probability deadlock"
am: bb5cbc539f

Change-Id: Ife7dd96618b75fd492aaf0397870653d63cf0d5e

6 years agoMerge "Remove flags in fs-verity header"
TreeHugger Robot [Wed, 21 Feb 2018 22:54:44 +0000 (22:54 +0000)]
Merge "Remove flags in fs-verity header"

6 years agoMerge "Check for location access on TelephonyRegistry"
Hall Liu [Wed, 21 Feb 2018 22:42:08 +0000 (22:42 +0000)]
Merge "Check for location access on TelephonyRegistry"

6 years agoFix comment on config_defaultTextClassifierPackage
Makoto Onuki [Wed, 21 Feb 2018 22:31:51 +0000 (14:31 -0800)]
Fix comment on config_defaultTextClassifierPackage

Bug: 73083596
Test: build
Change-Id: Ic1801f51511d3b0ca127b0d095672f2eaf3dcaef

6 years agoStatsd anomaly output log fix
Bookatz [Wed, 21 Feb 2018 22:30:51 +0000 (14:30 -0800)]
Statsd anomaly output log fix

Alert.id() is signed, so the output line needs to be lld instead of llu.

Test: none
Change-Id: I7e3eeddac60931234285548b99a9c9cc78582716

6 years agoFix the bug of timestamp encoding in event metric report.
Yangster [Wed, 21 Feb 2018 22:08:17 +0000 (14:08 -0800)]
Fix the bug of timestamp encoding in event metric report.

Test: statsd cts tests
Change-Id: Id1d330f5d48d15ba026ae7c7e8cf4e1f6b460fba

6 years agoMerge "Verify last array's length in readFromParcel"
Fyodor Kupolov [Wed, 21 Feb 2018 22:03:37 +0000 (22:03 +0000)]
Merge "Verify last array's length in readFromParcel"

6 years agoMerge "Fix opacity of expanded shade during transitions"
TreeHugger Robot [Wed, 21 Feb 2018 21:54:33 +0000 (21:54 +0000)]
Merge "Fix opacity of expanded shade during transitions"

6 years agoMerge "Explicitly restart the killed wallpaper service"
Chris Tate [Wed, 21 Feb 2018 21:49:31 +0000 (21:49 +0000)]
Merge "Explicitly restart the killed wallpaper service"

6 years agoImplement UNLIMITED_SHORTCUTS_API_CALLS permission.
Makoto Onuki [Wed, 21 Feb 2018 19:24:43 +0000 (11:24 -0800)]
Implement UNLIMITED_SHORTCUTS_API_CALLS permission.

Bug: 73083596

Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest10 -w com.android.frameworks.servicestests
Test: atest CtsShortcutManagerTestCases
Change-Id: I2283d105af166acc1a5b34921dd7a9cb50ef2e71

6 years agoMerge "Add HighAtomic to pagetypeinfo, and don't fail if a header can't be found...
TreeHugger Robot [Wed, 21 Feb 2018 21:42:35 +0000 (21:42 +0000)]
Merge "Add HighAtomic to pagetypeinfo, and don't fail if a header can't be found in proto definition."

6 years agoMerge "Handling additional enum for carrier half cycle"
Wyatt Riley [Wed, 21 Feb 2018 21:39:43 +0000 (21:39 +0000)]
Merge "Handling additional enum for carrier half cycle"

6 years agoMerge "Use PooledLambda in autofill code"
Eugene Susla [Wed, 21 Feb 2018 21:32:42 +0000 (21:32 +0000)]
Merge "Use PooledLambda in autofill code"

6 years agoMerge "Don't end transitions on a detached window, prevent crash in WindowId"
TreeHugger Robot [Wed, 21 Feb 2018 21:26:36 +0000 (21:26 +0000)]
Merge "Don't end transitions on a detached window, prevent crash in WindowId"

6 years agoMerge "Fix low probability deadlock"
Xiangyu/Malcolm Chen [Wed, 21 Feb 2018 21:16:44 +0000 (21:16 +0000)]
Merge "Fix low probability deadlock"

6 years agoMerge "Remove relevant configs when a uid (app) is uninstalled"
Howard Ro [Wed, 21 Feb 2018 21:12:41 +0000 (21:12 +0000)]
Merge "Remove relevant configs when a uid (app) is uninstalled"

6 years agoMerge "Use structural equality for A11yNodeInfo#mChildNodeIds"
TreeHugger Robot [Wed, 21 Feb 2018 20:59:21 +0000 (20:59 +0000)]
Merge "Use structural equality for A11yNodeInfo#mChildNodeIds"

6 years agoMerge "Unbind InputMethod when app crashes"
Tarandeep Singh [Wed, 21 Feb 2018 20:59:09 +0000 (20:59 +0000)]
Merge "Unbind InputMethod when app crashes"