OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 15 Nov 2017 03:09:45 +0000 (03:09 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Implement System Properties Section"
TreeHugger Robot [Wed, 15 Nov 2017 03:05:18 +0000 (03:05 +0000)]
Merge "Implement System Properties Section"

6 years agoMerge "Remove AutofillManagerClient after AutofillManager is finalized" am: dd5384a4f...
Koji Fukui [Wed, 15 Nov 2017 02:56:16 +0000 (02:56 +0000)]
Merge "Remove AutofillManagerClient after AutofillManager is finalized" am: dd5384a4fe am: 8d36beec24
am: bb4a13b097

Change-Id: I5f3eea81f662d0396b7fd384b2e91c2087f41c0f

6 years agoMerge "Implement intent to uri mapping for slices"
TreeHugger Robot [Wed, 15 Nov 2017 02:52:53 +0000 (02:52 +0000)]
Merge "Implement intent to uri mapping for slices"

6 years agoMerge "Remove AutofillManagerClient after AutofillManager is finalized" am: dd5384a4fe
Koji Fukui [Wed, 15 Nov 2017 02:42:44 +0000 (02:42 +0000)]
Merge "Remove AutofillManagerClient after AutofillManager is finalized" am: dd5384a4fe
am: 8d36beec24

Change-Id: I76ac103f2d6df4a32a49c0c460344a8049d7d3c3

6 years agoMerge commit '98e12851336b7db16e583f9afac63ecc97465980' from oc-mr1-dev-plus-aosp...
Xin Li [Wed, 15 Nov 2017 02:39:52 +0000 (02:39 +0000)]
Merge commit '98e12851336b7db16e583f9afac63ecc97465980' from oc-mr1-dev-plus-aosp-without-vendor into stage-aosp- am: 220871a697  -s ours
am: 2436ec217c  -s ours

Change-Id: Idfc0b2349f7475089373c8fdceebe7f166a5cd37

6 years agoMerge "Remove AutofillManagerClient after AutofillManager is finalized"
Koji Fukui [Wed, 15 Nov 2017 02:35:18 +0000 (02:35 +0000)]
Merge "Remove AutofillManagerClient after AutofillManager is finalized"
am: dd5384a4fe

Change-Id: If0b092c5e18005fb4b8c1fd8405f4d666c98de5a

6 years agoMerge "Remove AutofillManagerClient after AutofillManager is finalized"
Treehugger Robot [Wed, 15 Nov 2017 02:23:27 +0000 (02:23 +0000)]
Merge "Remove AutofillManagerClient after AutofillManager is finalized"

6 years agoMerge commit '98e12851336b7db16e583f9afac63ecc97465980' from oc-mr1-dev-plus-aosp...
Xin Li [Wed, 15 Nov 2017 01:30:08 +0000 (01:30 +0000)]
Merge commit '98e12851336b7db16e583f9afac63ecc97465980' from oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-
am: 220871a697  -s ours

Change-Id: I2d08ca9a952babfd1480278ca6331b697be2a32e

6 years agoMerge "Use callback to run binder service to avoid race"
TreeHugger Robot [Wed, 15 Nov 2017 01:16:38 +0000 (01:16 +0000)]
Merge "Use callback to run binder service to avoid race"

6 years agoMerge "Enforce REQUEST_DELETE_PACKAGES for PackageInstaller.uninstall()"
TreeHugger Robot [Wed, 15 Nov 2017 01:09:06 +0000 (01:09 +0000)]
Merge "Enforce REQUEST_DELETE_PACKAGES for PackageInstaller.uninstall()"

6 years agoMerge "Dump the overview proxy service information"
TreeHugger Robot [Wed, 15 Nov 2017 00:52:21 +0000 (00:52 +0000)]
Merge "Dump the overview proxy service information"

6 years agoMerge "Fix NullPointerException in CustomEditTextPreference."
TreeHugger Robot [Wed, 15 Nov 2017 00:33:11 +0000 (00:33 +0000)]
Merge "Fix NullPointerException in CustomEditTextPreference."

6 years agoMerge "WPS Metrics Added to wifi.proto"
Jong Wook Kim [Wed, 15 Nov 2017 00:25:13 +0000 (00:25 +0000)]
Merge "WPS Metrics Added to wifi.proto"

6 years agoMerge "Fix import of android-support-annotations"
Aurimas Liutikas [Wed, 15 Nov 2017 00:23:39 +0000 (00:23 +0000)]
Merge "Fix import of android-support-annotations"

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 14 Nov 2017 23:44:29 +0000 (15:44 -0800)]
Import translations. DO NOT MERGE

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

6 years agoUse callback to run binder service to avoid race
Lifu Tang [Mon, 13 Nov 2017 23:51:54 +0000 (15:51 -0800)]
Use callback to run binder service to avoid race

The binder interface should always be managed by ServiceWatcher, and
shouldn't be exposed to the caller. Otherwise the caller could cache an
unbound service, and could cause system crash.

Bug: 69008332
Test: build and manual test
Change-Id: I70d1fe0bace7b0fb1c3844c2c9113b1fcf95f784

6 years agoMerge "Make ic_print and ic_print_error vector graphics"
TreeHugger Robot [Tue, 14 Nov 2017 22:58:08 +0000 (22:58 +0000)]
Merge "Make ic_print and ic_print_error vector graphics"

6 years agoDump the overview proxy service information
Matthew Ng [Tue, 14 Nov 2017 22:47:05 +0000 (14:47 -0800)]
Dump the overview proxy service information

Dumps into the dependency chain of its number of connection attempts, if
user has completed setup and if the connection is currently established.

Test: adb shell dumpsys activity service com.android.systemui
Bug: 67957962
Change-Id: I1d5ffc51f99f08c21495d51a32a103ab8fed757c

6 years agoEnforce REQUEST_DELETE_PACKAGES for PackageInstaller.uninstall()
Philip P. Moltmann [Tue, 5 Sep 2017 19:41:15 +0000 (12:41 -0700)]
Enforce REQUEST_DELETE_PACKAGES for PackageInstaller.uninstall()

Fixes: 64576642
Test: Uninstalled apps
Change-Id: Ia7f3c047bb9c725228ca45e4c34e51a2d9177120

6 years agoImplement intent to uri mapping for slices
Mady Mellor [Thu, 19 Oct 2017 17:12:09 +0000 (10:12 -0700)]
Implement intent to uri mapping for slices

This adds the notion of creating a slice based on an intent. To use this
developers can implement onMapIntentToUri and return a uri based on the
intent. This enables SliceView to be populated via an intent.

Test: to be added...
Change-Id: I2abd861f2a3dff80ab8b6492a5c3205bc891d19c

6 years agoMerge "Dissallow Heads up when redacted"
Selim Cinek [Tue, 14 Nov 2017 22:19:32 +0000 (22:19 +0000)]
Merge "Dissallow Heads up when redacted"

6 years agoMerge "Rename "stats_events" as "atom"."
Stefan Lafon [Tue, 14 Nov 2017 22:03:54 +0000 (22:03 +0000)]
Merge "Rename "stats_events" as "atom"."

6 years agoFix NullPointerException in CustomEditTextPreference.
Doris Ling [Tue, 14 Nov 2017 21:59:25 +0000 (13:59 -0800)]
Fix NullPointerException in CustomEditTextPreference.

- check for valid dialog in getEditText() when trying to retrieve the
edit view from the dialog.

Change-Id: Ia8e2273ab0f3d75567ab16e1175bef88f7516a5d
Fixes: 69281837
Test: make RunSettingsLibRoboTests

6 years agoMerge "Add hints for toggles in Slice"
TreeHugger Robot [Tue, 14 Nov 2017 21:56:07 +0000 (21:56 +0000)]
Merge "Add hints for toggles in Slice"

6 years agoMerge "Fix the comments of onError() callback" am: 5f291e5e06 am: 802f191b2b
yinxu [Tue, 14 Nov 2017 21:38:17 +0000 (21:38 +0000)]
Merge "Fix the comments of onError() callback" am: 5f291e5e06 am: 802f191b2b
am: 5b88b69067

Change-Id: I54a9769dc9c62bce97205fe534f38cf27d0a5f8b

6 years agoMerge "TimePickerDialog OTG keyboard entry discarded" am: 8c2cb6ff08 am: 2973f63816
Tianran Li [Tue, 14 Nov 2017 21:31:38 +0000 (21:31 +0000)]
Merge "TimePickerDialog OTG keyboard entry discarded" am: 8c2cb6ff08 am: 2973f63816
am: 97997ca19e

Change-Id: I599c31481eef25311f8500df1428602051f1d04b

6 years agoMerge "Convert SettingsLib Lifecycle to Flatfoot"
TreeHugger Robot [Tue, 14 Nov 2017 21:21:48 +0000 (21:21 +0000)]
Merge "Convert SettingsLib Lifecycle to Flatfoot"

6 years agoMerge "Fix focusfinder coretests"
TreeHugger Robot [Tue, 14 Nov 2017 20:58:51 +0000 (20:58 +0000)]
Merge "Fix focusfinder coretests"

6 years agoMerge "Disable skia shader cache"
TreeHugger Robot [Tue, 14 Nov 2017 20:54:00 +0000 (20:54 +0000)]
Merge "Disable skia shader cache"

6 years agoMerge "In GnssLocationProvider wrap Binder.restoreCallingIdentity() in finally{}."
Peter Visontay [Tue, 14 Nov 2017 20:33:13 +0000 (20:33 +0000)]
Merge "In GnssLocationProvider wrap Binder.restoreCallingIdentity() in finally{}."

6 years agoMerge "Fix the comments of onError() callback" am: 5f291e5e06
yinxu [Tue, 14 Nov 2017 20:32:59 +0000 (20:32 +0000)]
Merge "Fix the comments of onError() callback" am: 5f291e5e06
am: 802f191b2b

Change-Id: I949d1c3ed1155af86e19428ca1e4877303baaaa7

6 years agoMerge commit '98e12851336b7db16e583f9afac63ecc97465980' from
Xin Li [Tue, 14 Nov 2017 20:31:11 +0000 (12:31 -0800)]
Merge commit '98e12851336b7db16e583f9afac63ecc97465980' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.

Change-Id: Ia7b8da4a00d215160e4a4fa40f6044208d1297b7
Merged-In: I19846d2a3ee27aecbae2367a74ee49082eea154d

6 years agoMerge "Fix the comments of onError() callback"
yinxu [Tue, 14 Nov 2017 20:25:16 +0000 (20:25 +0000)]
Merge "Fix the comments of onError() callback"
am: 5f291e5e06

Change-Id: If034888c0baeaae882e150eff477083974541541

6 years agoMerge "Adds client API for interacting with statsd."
TreeHugger Robot [Tue, 14 Nov 2017 20:25:09 +0000 (20:25 +0000)]
Merge "Adds client API for interacting with statsd."

6 years agoMerge "Fix the comments of onError() callback"
Treehugger Robot [Tue, 14 Nov 2017 20:12:02 +0000 (20:12 +0000)]
Merge "Fix the comments of onError() callback"

6 years agoAdd hints for toggles in Slice
Mady Mellor [Wed, 8 Nov 2017 22:15:43 +0000 (14:15 -0800)]
Add hints for toggles in Slice

Test: Manual, build a slice with a toggle needs the support lib CL to
      present the toggle
Bug: 68378574

Change-Id: I4cdae84e11e2b182663186f862fed95e3bacbac5

6 years agoRename "stats_events" as "atom".
Stefan Lafon [Tue, 14 Nov 2017 17:17:21 +0000 (09:17 -0800)]
Rename "stats_events" as "atom".

Also make atom WakelockStateChanged use the "Type" enum instead of int32.

Test: Unittests are passing. Statsd is working.

Change-Id: I0909e2d97297f78996a81366d66aae62d5bf5ce1

6 years agoMerge "TimePickerDialog OTG keyboard entry discarded" am: 8c2cb6ff08
Tianran Li [Tue, 14 Nov 2017 19:55:16 +0000 (19:55 +0000)]
Merge "TimePickerDialog OTG keyboard entry discarded" am: 8c2cb6ff08
am: 2973f63816

Change-Id: Ia9904d1654ec70e1c039d8f1fed6c1211863ee38

6 years agoMerge "TimePickerDialog OTG keyboard entry discarded"
Tianran Li [Tue, 14 Nov 2017 19:47:34 +0000 (19:47 +0000)]
Merge "TimePickerDialog OTG keyboard entry discarded"
am: 8c2cb6ff08

Change-Id: Ib28468e637c146e69d59ee352b5a019654b3dc14

6 years agoMerge "TimePickerDialog OTG keyboard entry discarded"
Treehugger Robot [Tue, 14 Nov 2017 19:35:20 +0000 (19:35 +0000)]
Merge "TimePickerDialog OTG keyboard entry discarded"

6 years agoFix import of android-support-annotations
Aurimas Liutikas [Tue, 14 Nov 2017 01:41:39 +0000 (01:41 +0000)]
Fix import of android-support-annotations

Bug: 69161825
Change-Id: I647516330d9990869f78084e2d393742000e836b

6 years agoMerge "Fix some mouse + list-item selection/scrolling issues"
TreeHugger Robot [Tue, 14 Nov 2017 19:21:01 +0000 (19:21 +0000)]
Merge "Fix some mouse + list-item selection/scrolling issues"

6 years agoWPS Metrics Added to wifi.proto
Jong Wook Kim [Thu, 26 Oct 2017 20:16:36 +0000 (13:16 -0700)]
WPS Metrics Added to wifi.proto

Add wpw metrics fields to wifi.proto to track wps usage

Bug: 68652564
Test: Unit test and verifying dumpsys
Change-Id: I224adf7e522af9609569f703f1ccc31b1444d6e4

6 years agoFix focusfinder coretests
Evan Rosky [Tue, 14 Nov 2017 19:04:54 +0000 (11:04 -0800)]
Fix focusfinder coretests

beams are no-longer considered overlapping if edges touch. These
coretests weren't updated to reflect that.

Bug: 67467972
Test: android.view.FocusFinderTest
Change-Id: Ibc1535c1b232fe1c42104ff8970b371fbc8a7c25

6 years agoDissallow Heads up when redacted
Selim Cinek [Tue, 14 Nov 2017 18:14:32 +0000 (10:14 -0800)]
Dissallow Heads up when redacted

Change-Id: Ie5069f3fa6b6811da352c60239f48224d106a04f
Fixes: 69137468
Test: phonecall while occluded and with redacted notifications

6 years agoImplement System Properties Section
Yi Jin [Tue, 7 Nov 2017 01:43:47 +0000 (17:43 -0800)]
Implement System Properties Section

Bug: 68774852
Test: unit tested and on device tests
Change-Id: I0d4aadf8d4203fe56e35bbfb77e5c532116fd27e

6 years agoDisable skia shader cache
Stan Iliev [Tue, 14 Nov 2017 18:42:42 +0000 (13:42 -0500)]
Disable skia shader cache

Disable skia shader cache, which is causing image rendering
issues.

Test: Ran CNN app and images are OK.
Bug: 69264347
Change-Id: Ie81f3398074f28ac1670333f1fd3c95267b2beb3

6 years agoMerge "Allow assistant app to access any shortcuts"
TreeHugger Robot [Tue, 14 Nov 2017 18:41:50 +0000 (18:41 +0000)]
Merge "Allow assistant app to access any shortcuts"

6 years agoConvert SettingsLib Lifecycle to Flatfoot
Tony Mantler [Fri, 10 Nov 2017 21:16:59 +0000 (13:16 -0800)]
Convert SettingsLib Lifecycle to Flatfoot

Bug: 69257739
Test: m -j RunSettingsLibRoboTests
Change-Id: Iaf14f6f26689a54248bd27cffce0423e857181b9

6 years agoMerge "Use uname instead of proc/version"
Jeffrey Huang [Tue, 14 Nov 2017 18:11:13 +0000 (18:11 +0000)]
Merge "Use uname instead of proc/version"

6 years agoMerge "Apps can now specify journal/synchronous mode"
Fyodor Kupolov [Tue, 14 Nov 2017 17:53:06 +0000 (17:53 +0000)]
Merge "Apps can now specify journal/synchronous mode"

6 years agoMerge "Better, consistent definition of AID_SHARED_GID." am: 7e875df695 am: 42064a3aa2
Jeff Sharkey [Tue, 14 Nov 2017 17:32:59 +0000 (17:32 +0000)]
Merge "Better, consistent definition of AID_SHARED_GID." am: 7e875df695 am: 42064a3aa2
am: 7018dbc8ab

Change-Id: I02f17bc42dced22c332bb3eb9e195a64ee0b5776

6 years agoMerge "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel." am: 45e1c...
Cassie [Tue, 14 Nov 2017 17:21:28 +0000 (17:21 +0000)]
Merge "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel." am: 45e1c58591 am: 59439e38a6
am: 2c9a0c746f

Change-Id: I79db893680f01f9b252432c418d1ecf5fa3bb25e

6 years agoMerge "Better, consistent definition of AID_SHARED_GID." am: 7e875df695
Jeff Sharkey [Tue, 14 Nov 2017 17:19:57 +0000 (17:19 +0000)]
Merge "Better, consistent definition of AID_SHARED_GID." am: 7e875df695
am: 42064a3aa2

Change-Id: I85979f6f70bbef34d6041495310b442cb0405d2d

6 years agoMerge "Merge "Stop using c.a.i.u.Predicate outside test-runner" am: ee2fb3c59e am...
Android Build Merger (Role) [Tue, 14 Nov 2017 17:13:49 +0000 (17:13 +0000)]
Merge "Merge "Stop using c.a.i.u.Predicate outside test-runner" am: ee2fb3c59e am: 847df2cafc am: 3b24847d39"

6 years agoMerge "Stop using c.a.i.u.Predicate outside test-runner" am: ee2fb3c59e am: 847df2cafc
Paul Duffin [Tue, 14 Nov 2017 17:11:43 +0000 (17:11 +0000)]
Merge "Stop using c.a.i.u.Predicate outside test-runner" am: ee2fb3c59e am: 847df2cafc
am: 3b24847d39

Change-Id: Ibc581c8ce0f859d17dd387e29e37fba6184b3488

6 years agoMerge "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel." am: 45e1c...
Cassie [Tue, 14 Nov 2017 17:07:26 +0000 (17:07 +0000)]
Merge "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel." am: 45e1c58591
am: 59439e38a6

Change-Id: Ia6ff98854a32b54b5f4a2bb8c5b533e62ff27b65

6 years agoMerge "Merge "Create secondary dex profiles relative to the provided dex path" am...
Android Build Merger (Role) [Tue, 14 Nov 2017 17:05:43 +0000 (17:05 +0000)]
Merge "Merge "Create secondary dex profiles relative to the provided dex path" am: f7f5732e2c am: 310bc2b571 am: 8ed29cdd59  -s ours"

6 years agoMerge "Better, consistent definition of AID_SHARED_GID."
Jeff Sharkey [Tue, 14 Nov 2017 17:04:06 +0000 (17:04 +0000)]
Merge "Better, consistent definition of AID_SHARED_GID."
am: 7e875df695

Change-Id: Ifad7e44a21aeebdeaab3b31c93ece145f86a1cb9

6 years agoMerge "Create secondary dex profiles relative to the provided dex path" am: f7f5732e2...
Calin Juravle [Tue, 14 Nov 2017 17:02:01 +0000 (17:02 +0000)]
Merge "Create secondary dex profiles relative to the provided dex path" am: f7f5732e2c am: 310bc2b571
am: 8ed29cdd59  -s ours

Change-Id: Ibdeee5ccb67da81afd649aca41764d5d5f2ec0cf

6 years agoMerge "[RTT2] Add WorkSource APIs to request/cancel ranging ops"
Etan Cohen [Tue, 14 Nov 2017 17:00:14 +0000 (17:00 +0000)]
Merge "[RTT2] Add WorkSource APIs to request/cancel ranging ops"

6 years agoMerge "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel."
Cassie [Tue, 14 Nov 2017 16:57:15 +0000 (16:57 +0000)]
Merge "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel."
am: 45e1c58591

Change-Id: Ic4da1daf9e47e064068d007f3e5a4fff3d8ef2e6

6 years agoMerge "DO NOT MERGE Remove orientation restriction to only fullscreen activities...
brycelee [Tue, 14 Nov 2017 16:55:34 +0000 (16:55 +0000)]
Merge "DO NOT MERGE Remove orientation restriction to only fullscreen activities." am: 62893396bd  -s ours am: 09494f6c01
am: ace838841d  -s ours

Change-Id: I49841af746dd69b01506a5fda41b4861c980bdab

6 years agoMerge "Customize the default value of Enhanced 4G LTE mode" am: 0f113b2f25 am: df79be072d
Jordan Liu [Tue, 14 Nov 2017 16:51:27 +0000 (16:51 +0000)]
Merge "Customize the default value of Enhanced 4G LTE mode" am: 0f113b2f25 am: df79be072d
am: 92c4fa8570

Change-Id: I0c40a2435feb57c7ebd90491cd0c3055f47b7a07

6 years agoMerge "Better, consistent definition of AID_SHARED_GID."
Jeff Sharkey [Tue, 14 Nov 2017 16:49:30 +0000 (16:49 +0000)]
Merge "Better, consistent definition of AID_SHARED_GID."

6 years agoMerge "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel."
Treehugger Robot [Tue, 14 Nov 2017 16:42:41 +0000 (16:42 +0000)]
Merge "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel."

6 years agoMerge "New class to track brightness slider interactions."
Kenny Guy [Tue, 14 Nov 2017 15:26:03 +0000 (15:26 +0000)]
Merge "New class to track brightness slider interactions."

6 years ago[RTT2] Add WorkSource APIs to request/cancel ranging ops
Etan Cohen [Tue, 31 Oct 2017 23:01:32 +0000 (16:01 -0700)]
[RTT2] Add WorkSource APIs to request/cancel ranging ops

Add System API to manage ranging operations. Use WorkSource to specify
the actual source of the operation. Add cancel API (using WorkSource)
to allow cleaning-up (proxying binder death).

Bug: 65015291
Test: unit tests and integration tests
Change-Id: I98f762df8b1d262d1f386963e7e2ff3569b001d5

6 years agoMerge "Log the CHANGE_WIFI_STATE App Op in WifiManager (client changes)."
Peter Visontay [Tue, 14 Nov 2017 14:46:20 +0000 (14:46 +0000)]
Merge "Log the CHANGE_WIFI_STATE App Op in WifiManager (client changes)."

6 years agoMerge "Show selection handles even when toolbar is empty."
TreeHugger Robot [Tue, 14 Nov 2017 14:41:52 +0000 (14:41 +0000)]
Merge "Show selection handles even when toolbar is empty."

6 years agoMerge "Camera: Enable API for dynamic camera output surfaces"
TreeHugger Robot [Tue, 14 Nov 2017 14:08:44 +0000 (14:08 +0000)]
Merge "Camera: Enable API for dynamic camera output surfaces"

6 years agoMerge "KeyChain: Adding methods for user-visibility."
Eran Messeri [Tue, 14 Nov 2017 13:43:03 +0000 (13:43 +0000)]
Merge "KeyChain: Adding methods for user-visibility."

6 years agoMerge "Stop using c.a.i.u.Predicate outside test-runner" am: ee2fb3c59e
Paul Duffin [Tue, 14 Nov 2017 13:24:31 +0000 (13:24 +0000)]
Merge "Stop using c.a.i.u.Predicate outside test-runner" am: ee2fb3c59e
am: 847df2cafc

Change-Id: I3d5f64b3551df8d5b3af1a18dfd63147fa186df7

6 years agoMerge "Stop using c.a.i.u.Predicate outside test-runner"
Paul Duffin [Tue, 14 Nov 2017 13:15:37 +0000 (13:15 +0000)]
Merge "Stop using c.a.i.u.Predicate outside test-runner"
am: ee2fb3c59e

Change-Id: I197bd9e2458ff9f966754c459ee77f03c3517eb5

6 years agoMerge "Stop using c.a.i.u.Predicate outside test-runner"
Treehugger Robot [Tue, 14 Nov 2017 13:05:20 +0000 (13:05 +0000)]
Merge "Stop using c.a.i.u.Predicate outside test-runner"

6 years agoMerge "Stop observing death of PrintManager listener when it is removed" am: e7240a52...
Koji Fukui [Tue, 14 Nov 2017 12:09:39 +0000 (12:09 +0000)]
Merge "Stop observing death of PrintManager listener when it is removed" am: e7240a52e2 am: 5cb172d17e
am: 9e3ff42caa

Change-Id: I3d643e52e86bbd4ff9bd588fba51fce82fbb35e9

6 years agoMerge "IP connectivity metrics: NetworkEvents have transports" am: f8fdb06c27 am...
Hugo Benichi [Tue, 14 Nov 2017 12:03:25 +0000 (12:03 +0000)]
Merge "IP connectivity metrics: NetworkEvents have transports" am: f8fdb06c27 am: f3ada43f6e
am: 1b2e6c11e7

Change-Id: If452f742e50344e730f63b7329788b19d13280ec

6 years agoMerge "Add L2~L4 information to packet wakeup logs and metrics" am: 6ee20ca7d3 am...
Hugo Benichi [Tue, 14 Nov 2017 11:55:45 +0000 (11:55 +0000)]
Merge "Add L2~L4 information to packet wakeup logs and metrics" am: 6ee20ca7d3 am: ab15f7fc64
am: 4c0b7e52e4

Change-Id: Ia0b300662d4758f31ca583c9cf05f9186b8331aa

6 years agoMerge "Add Network security watchlist service" am: e672ab4c0a am: 1aff5336e0
Hugo Benichi [Tue, 14 Nov 2017 11:49:00 +0000 (11:49 +0000)]
Merge "Add Network security watchlist service" am: e672ab4c0a am: 1aff5336e0
am: 652056767c  -s ours

Change-Id: I0679868ae3422a018cc86881c04a152883072697

6 years agoMerge "Remove GCC-specific pragma and disabled Clang warning" am: bcf27fa6a7 am:...
Pirama Arumuga Nainar [Tue, 14 Nov 2017 11:26:25 +0000 (11:26 +0000)]
Merge "Remove GCC-specific pragma and disabled Clang warning" am: bcf27fa6a7 am: 48a80c1a27
am: b79fefb75a

Change-Id: I0bb636dc921003239f736aa1db91d1ef8c7f8937

6 years agoMerge "Move connectSocket into IBluetoothSocketManager (3/3)" am: 8d742759cc am:...
Jakub Pawlowski [Tue, 14 Nov 2017 11:14:26 +0000 (11:14 +0000)]
Merge "Move connectSocket into IBluetoothSocketManager (3/3)" am: 8d742759cc am: 9c26701b35
am: 58de99a248  -s ours

Change-Id: I67655ed1c95c3e700a9ca8692ce68d7f468afcfa

6 years agoMerge "AAPT2 - Add ProtoApkSerializer implementation to convert from Binary to Proto."
Pierre Lecesne [Tue, 14 Nov 2017 10:58:25 +0000 (10:58 +0000)]
Merge "AAPT2 - Add ProtoApkSerializer implementation to convert from Binary to Proto."

6 years agoMerge changes from topic "am-5e44d23882d545a38f0ea8d1f78a13fa"
Android Build Merger (Role) [Tue, 14 Nov 2017 10:21:03 +0000 (10:21 +0000)]
Merge changes from topic "am-5e44d23882d545a38f0ea8d1f78a13fa"

* changes:
  Merge changes from topics "embms-cts-6", "embms-cts-5" am: f6b2b77e40 am: 2cd6464e9b am: 8fd59b38b7
  Add @TestApi for DownloadStateCallback CTS am: 63c5fd60ac am: b96d49e91f am: caac5df325

6 years agoMerge changes from topics "embms-cts-6", "embms-cts-5" am: f6b2b77e40 am: 2cd6464e9b
Hall Liu [Tue, 14 Nov 2017 10:17:36 +0000 (10:17 +0000)]
Merge changes from topics "embms-cts-6", "embms-cts-5" am: f6b2b77e40 am: 2cd6464e9b
am: 8fd59b38b7

Change-Id: I1217efc28d9d9c825dd9bf361d7f2f35510b4b27

6 years agoMerge "Explicit Roboletric version for runner"
Bernardo Rufino [Tue, 14 Nov 2017 10:13:36 +0000 (10:13 +0000)]
Merge "Explicit Roboletric version for runner"

6 years agoAdd @TestApi for DownloadStateCallback CTS am: 63c5fd60ac am: b96d49e91f
Hall Liu [Tue, 14 Nov 2017 10:13:27 +0000 (10:13 +0000)]
Add @TestApi for DownloadStateCallback CTS am: 63c5fd60ac am: b96d49e91f
am: caac5df325

Change-Id: Ifde502de2ae2aa3b22ea90a5f9bd5ece4746284e

6 years agoStop using c.a.i.u.Predicate outside test-runner
Paul Duffin [Tue, 14 Nov 2017 10:11:18 +0000 (10:11 +0000)]
Stop using c.a.i.u.Predicate outside test-runner

This class has been deprecated and should only be used in the
frameworks/base/test-runner directory.

Bug: 30188076
Test: make checkbuild
Change-Id: I61059a96aa6045c44546239b94b329c02bb745a1

6 years agoAAPT2 - Add ProtoApkSerializer implementation to convert from Binary to Proto.
Pierre Lecesne [Fri, 10 Nov 2017 23:50:17 +0000 (23:50 +0000)]
AAPT2 - Add ProtoApkSerializer implementation to convert from Binary to Proto.

Also new flag to choose the conversion direction:
  --output_format [binary|proto].

Test: Manual

Change-Id: I61d381aa49869b0fd6bd9f017dda0cac5ca998bb

6 years agoMerge "Sync statsd to the public proto changes: 1/ use string id/name for all metrics...
TreeHugger Robot [Tue, 14 Nov 2017 08:04:56 +0000 (08:04 +0000)]
Merge "Sync statsd to the public proto changes: 1/ use string id/name for all metrics/configs/matchers. 2/ move alerts out of metric proto."

6 years agoSync statsd to the public proto changes:
Yangster-mac [Tue, 14 Nov 2017 05:43:15 +0000 (21:43 -0800)]
Sync statsd to the public proto changes:
1/ use string id/name for all metrics/configs/matchers.
2/ move alerts out of metric proto.

Test: unit test passed.
Change-Id: I08269f47be30f83f6dbadf873e7d62213449932b

6 years agoMerge "incidentd: Adding proto comments for times that can be -1."
TreeHugger Robot [Tue, 14 Nov 2017 05:24:40 +0000 (05:24 +0000)]
Merge "incidentd: Adding proto comments for times that can be -1."

6 years agoincidentd: Adding proto comments for times that can be -1.
Kweku Adams [Tue, 14 Nov 2017 03:49:37 +0000 (19:49 -0800)]
incidentd: Adding proto comments for times that can be -1.

Bug: 65750826
Test: $ cts-tradefed run cts-dev --module CtsIncidentHostTestCases --test com.android.server.cts.PowerIncidentTest
Change-Id: Iac844fc3f7a9262022ecc74b001936a921ff5233

6 years agoAdds client API for interacting with statsd.
David Chen [Fri, 3 Nov 2017 22:42:08 +0000 (15:42 -0700)]
Adds client API for interacting with statsd.

This API will primarily be used by GmsCore to send updated configs.
Also, sending a config will implicitly notify the StatsD that this
client wants to know when it should request data for this config.

We send a broadcast so that all interested subscribers can know if
data needs to be pulled.

Test: Manually tested that sending broadcast works via new adb
command added in StatsService.

Change-Id: I23cdd1df706036e14b32c3d01af30c3d4af819fa

6 years agoMerge "Create secondary dex profiles relative to the provided dex path" am: f7f5732e2c
Calin Juravle [Tue, 14 Nov 2017 03:14:34 +0000 (03:14 +0000)]
Merge "Create secondary dex profiles relative to the provided dex path" am: f7f5732e2c
am: 310bc2b571

Change-Id: Ic639fd4d9f0e0a76669c1dd05bc0c0a86f84a074

6 years agoMerge "Create secondary dex profiles relative to the provided dex path"
Calin Juravle [Tue, 14 Nov 2017 03:03:56 +0000 (03:03 +0000)]
Merge "Create secondary dex profiles relative to the provided dex path"
am: f7f5732e2c

Change-Id: I6f2eb760e07959e26d46f8a0f3d4b4358b9a5a1e

6 years agoMerge "Support insets on secondary displays"
TreeHugger Robot [Tue, 14 Nov 2017 02:59:12 +0000 (02:59 +0000)]
Merge "Support insets on secondary displays"

6 years agoMerge "Create secondary dex profiles relative to the provided dex path"
Treehugger Robot [Tue, 14 Nov 2017 02:54:59 +0000 (02:54 +0000)]
Merge "Create secondary dex profiles relative to the provided dex path"

6 years agoMerge "Move Ims related settings from global setting to subscription db."
Xiangyu/Malcolm Chen [Tue, 14 Nov 2017 02:51:21 +0000 (02:51 +0000)]
Merge "Move Ims related settings from global setting to subscription db."

6 years agoMerge "incidentd: Updating Settings Provider proto dump."
TreeHugger Robot [Tue, 14 Nov 2017 02:22:34 +0000 (02:22 +0000)]
Merge "incidentd: Updating Settings Provider proto dump."