OSDN Git Service

android-x86/frameworks-base.git
7 years agoPrevent writing to FRP partition during factory reset.
Charles He [Thu, 24 Nov 2016 14:05:00 +0000 (14:05 +0000)]
Prevent writing to FRP partition during factory reset.

Avoid potential race condition between FRP wipe and write operations
during factory reset by making the FRP partition unwritable after
wipe.

Bug: 30352311
Test: manual
Change-Id: If3f024a1611366c0677a996705724458094fcfad

7 years agoMerge "Move Resource creation out of ContextImpl constructor"
Adam Lesinski [Wed, 23 Nov 2016 19:19:31 +0000 (19:19 +0000)]
Merge "Move Resource creation out of ContextImpl constructor"

7 years agoMerge "Merge "Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger" into...
Android Build Merger (Role) [Wed, 23 Nov 2016 18:40:58 +0000 (18:40 +0000)]
Merge "Merge "Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger" into nyc-mr1-dev-plus-aosp am: 39677cea6a am: 5b31fb39f2"

7 years agoMerge "Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger" into nyc-mr1...
Baligh Uddin [Wed, 23 Nov 2016 18:40:25 +0000 (18:40 +0000)]
Merge "Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger" into nyc-mr1-dev-plus-aosp am: 39677cea6a
am: 5b31fb39f2

Change-Id: I51b980693c4d48fcf74ca85e0aba54fd2524bf42

7 years agoMerge "Add int[] JNI benchmarks"
John Reck [Wed, 23 Nov 2016 18:40:16 +0000 (18:40 +0000)]
Merge "Add int[] JNI benchmarks"

7 years agoMerge "Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger" into nyc-mr1...
Baligh Uddin [Wed, 23 Nov 2016 18:36:03 +0000 (18:36 +0000)]
Merge "Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger" into nyc-mr1-dev-plus-aosp
am: 39677cea6a

Change-Id: I99a06cbdd5087ee7ce4528d7c3ef41bee1b29fa7

7 years agoMerge remote-tracking branch 'goog/cw-f-dev' into fix_merger am: b1df48d326 -s ours
Baligh Uddin [Wed, 23 Nov 2016 18:34:12 +0000 (18:34 +0000)]
Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger am: b1df48d326  -s ours
am: fdbb74ef63

Change-Id: Ibc6010d35accc93b8083960876281a133d266766

7 years agoMerge remote-tracking branch 'goog/cw-f-dev' into fix_merger
Baligh Uddin [Wed, 23 Nov 2016 18:26:38 +0000 (18:26 +0000)]
Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger
am: b1df48d326  -s ours

Change-Id: I915d9c44742a9e4193a5c405e0d4cfae770aaaf7

7 years agoMerge "Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger" into nyc-mr1...
Baligh Uddin [Wed, 23 Nov 2016 17:56:24 +0000 (17:56 +0000)]
Merge "Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger" into nyc-mr1-dev-plus-aosp

7 years agoMerge "Unhiding strong auth timeout API"
Michal Karpinski [Wed, 23 Nov 2016 17:42:55 +0000 (17:42 +0000)]
Merge "Unhiding strong auth timeout API"

7 years agoMerge "Revert "WindowList be gone!""
Jorim Jaggi [Wed, 23 Nov 2016 17:03:47 +0000 (17:03 +0000)]
Merge "Revert "WindowList be gone!""

7 years agoRevert "WindowList be gone!"
Jorim Jaggi [Wed, 23 Nov 2016 16:59:19 +0000 (16:59 +0000)]
Revert "WindowList be gone!"

This reverts commit 4551c8bbee4114fa884938dbe90ac0d06ca78fc5.

Reason for revert: Broke a lot of things!

Bug: 33098800
Bug: 33098294
Change-Id: I307b1c7ee39445d6155a4bbce2bf5f289de55285

7 years agoMerge "Introduce TextAssistant for Smart Text Share feature."
Abodunrinwa Toki [Wed, 23 Nov 2016 16:29:37 +0000 (16:29 +0000)]
Merge "Introduce TextAssistant for Smart Text Share feature."

7 years agoMerge "Only acquire FPM if feature is available"
Jorim Jaggi [Wed, 23 Nov 2016 15:29:46 +0000 (15:29 +0000)]
Merge "Only acquire FPM if feature is available"

7 years agoUnhiding strong auth timeout API
Michal Karpinski [Wed, 23 Nov 2016 12:09:08 +0000 (12:09 +0000)]
Unhiding strong auth timeout API

Unhiding the API that was previously hidden (in order to ship in MR1).

Bug: 29825955
Change-Id: Ifce73b1917b939e68e9a8dd2cc7379717214b8b7

7 years agoMerge "Fix ConnectivityServiceTest testRequestBenchmark"
TreeHugger Robot [Wed, 23 Nov 2016 11:24:12 +0000 (11:24 +0000)]
Merge "Fix ConnectivityServiceTest testRequestBenchmark"

7 years agoMerge "Fix Keyboard flicker"
Jorim Jaggi [Wed, 23 Nov 2016 10:27:22 +0000 (10:27 +0000)]
Merge "Fix Keyboard flicker"

7 years agoOnly acquire FPM if feature is available
Jorim Jaggi [Tue, 22 Nov 2016 12:45:17 +0000 (13:45 +0100)]
Only acquire FPM if feature is available

Test: Boot non-fp device, observe no wtf
Change-Id: If32b2370413f8bfe1477af52809c76e8c892cafa
Fixes: 32976626

7 years agoMerge "PackageManager: Avoid creating encoders for appIds being written /config/sdcardfs"
Narayan Kamath [Wed, 23 Nov 2016 10:23:04 +0000 (10:23 +0000)]
Merge "PackageManager: Avoid creating encoders for appIds being written /config/sdcardfs"

7 years agoMerge "PackageManager: Remove obsolete SCAN_NO_PATHS / SCAN_DEFER_DEX flags."
Narayan Kamath [Wed, 23 Nov 2016 10:18:06 +0000 (10:18 +0000)]
Merge "PackageManager: Remove obsolete SCAN_NO_PATHS / SCAN_DEFER_DEX flags."

7 years agoPackageManager: Remove obsolete SCAN_NO_PATHS / SCAN_DEFER_DEX flags.
Narayan Kamath [Tue, 22 Nov 2016 13:45:12 +0000 (13:45 +0000)]
PackageManager: Remove obsolete SCAN_NO_PATHS / SCAN_DEFER_DEX flags.

SCAN_NO_PATHS hasn't been used in the past several years, and was
introduced to deal with ASEC containers, and those are now handled by
DefaultContainerService.

SCAN_DEFER_DEX has been made obsolete by the JIT work we've done in N.

Test: make & boot
Change-Id: Ib2ffa8bd3c31d645a7efc5d78b03ca0774590f07

7 years agoPackageManager: Avoid creating encoders for appIds being written /config/sdcardfs
Narayan Kamath [Tue, 22 Nov 2016 20:20:00 +0000 (20:20 +0000)]
PackageManager: Avoid creating encoders for appIds being written /config/sdcardfs

We know they will be ASCII, so use String.getBytes(US-ASCII) which is
much faster than creating a new ICU based CharsetEncoder for UTF-8 every time
we write one of these files (there will be a lot of them).

Test: make + manual.
Change-Id: I8eb62862ea1083e194d3f23ac68bb40aaae5efd5

7 years agoFix ConnectivityServiceTest testRequestBenchmark
Hugo Benichi [Tue, 15 Nov 2016 02:25:52 +0000 (11:25 +0900)]
Fix ConnectivityServiceTest testRequestBenchmark

This patch fixes flakyness of testRequestBenchmark by adjusting time
limit for callback registration from 100ms to 180ms, and time limits for
onAvailable and onLost triggers from 30ms to 40ms.

With these timeouts the test succeeds 100% over 5000 iterations.

When using 150ms for registration timeout, running the test 5000 times
fails 2 times.

When using 30ms for onLost timeout, running the test 5000 times fails
1 times.

In addition, this patch also cleans testRequestBenchmark and uses the
more stable SystemClock.elapsedRealtime() for duration measurements.

Test: $ runtest frameworks-net
Bug: 32561414
Change-Id: I7601b2f1f11f83914f885a74c8a376173eed186b

7 years agoMerge "Expose TelephonyManager#{set,get}DataEnabled." am: 99d6227782 am: fa8e6c0f5a...
Jeff Davidson [Wed, 23 Nov 2016 04:21:24 +0000 (04:21 +0000)]
Merge "Expose TelephonyManager#{set,get}DataEnabled." am: 99d6227782 am: fa8e6c0f5a am: b369ad4b19
am: 1cea0c249d  -s ours

Change-Id: I759166ff02040ac7244b35815de04230773dff5d

7 years agoMerge "Expose TelephonyManager#{set,get}DataEnabled." am: 99d6227782 am: fa8e6c0f5a
Jeff Davidson [Wed, 23 Nov 2016 04:14:23 +0000 (04:14 +0000)]
Merge "Expose TelephonyManager#{set,get}DataEnabled." am: 99d6227782 am: fa8e6c0f5a
am: b369ad4b19

Change-Id: I0ed5ac68a7974ade21b1d6aa2279fde179070c0c

7 years agoMerge "Expose TelephonyManager#{set,get}DataEnabled." am: 99d6227782
Jeff Davidson [Wed, 23 Nov 2016 04:06:07 +0000 (04:06 +0000)]
Merge "Expose TelephonyManager#{set,get}DataEnabled." am: 99d6227782
am: fa8e6c0f5a

Change-Id: I55d2e8ffcf70aad48acdf1fa97da5b2874d26925

7 years agoMerge "Expose TelephonyManager#{set,get}DataEnabled."
Jeff Davidson [Wed, 23 Nov 2016 04:01:22 +0000 (04:01 +0000)]
Merge "Expose TelephonyManager#{set,get}DataEnabled."
am: 99d6227782

Change-Id: Iacdd6d802725ab1b45c273ad7c8de7c85c8cb801

7 years agoMerge "Expose TelephonyManager#{set,get}DataEnabled."
Jeff Davidson [Wed, 23 Nov 2016 03:55:26 +0000 (03:55 +0000)]
Merge "Expose TelephonyManager#{set,get}DataEnabled."

7 years agoMerge "Add test for TileUtils."
TreeHugger Robot [Wed, 23 Nov 2016 03:38:44 +0000 (03:38 +0000)]
Merge "Add test for TileUtils."

7 years agoMerge "Fix static analyzer warnings." am: 9c69c41b95 am: 4cfb0f020f am: 6ab25ba5f1
George Burgess IV [Wed, 23 Nov 2016 03:05:46 +0000 (03:05 +0000)]
Merge "Fix static analyzer warnings." am: 9c69c41b95 am: 4cfb0f020f am: 6ab25ba5f1
am: cf1a558aed

Change-Id: I4e2608df649dfd3384aadd1f69d88ffc69bf7ea9

7 years agoMerge "Fix static analyzer warnings." am: 9c69c41b95 am: 4cfb0f020f
George Burgess IV [Wed, 23 Nov 2016 03:01:12 +0000 (03:01 +0000)]
Merge "Fix static analyzer warnings." am: 9c69c41b95 am: 4cfb0f020f
am: 6ab25ba5f1

Change-Id: I60b13b493cde64c7d202ba28534bca227f6d4941

7 years agoMerge "Fix static analyzer warnings." am: 9c69c41b95
George Burgess IV [Wed, 23 Nov 2016 02:56:11 +0000 (02:56 +0000)]
Merge "Fix static analyzer warnings." am: 9c69c41b95
am: 4cfb0f020f

Change-Id: I127bbf30a44342e2464a29c7b1793861f3c44931

7 years agoMerge "Fix static analyzer warnings."
George Burgess IV [Wed, 23 Nov 2016 02:52:13 +0000 (02:52 +0000)]
Merge "Fix static analyzer warnings."
am: 9c69c41b95

Change-Id: I62b951aa16a714343f155fa3af86f58933212ebb

7 years agoMerge "Fix static analyzer warnings."
Treehugger Robot [Wed, 23 Nov 2016 02:45:54 +0000 (02:45 +0000)]
Merge "Fix static analyzer warnings."

7 years agoMerge "Bluetooth: report proper advertiser status on error" am: b509957e62 am: 673c0e...
Jakub Pawlowski [Wed, 23 Nov 2016 02:15:40 +0000 (02:15 +0000)]
Merge "Bluetooth: report proper advertiser status on error" am: b509957e62 am: 673c0e5596 am: e8ceb15b51
am: 0debe3c5b7

Change-Id: Iff59148dd5862bf0dcc51112b27ced7e9f76bef6

7 years agoMerge "Bluetooth: report proper advertiser status on error" am: b509957e62 am: 673c0e5596
Jakub Pawlowski [Wed, 23 Nov 2016 02:08:12 +0000 (02:08 +0000)]
Merge "Bluetooth: report proper advertiser status on error" am: b509957e62 am: 673c0e5596
am: e8ceb15b51

Change-Id: I21eb000be58fd61b238e2401cf266b6f132acc83

7 years agoMerge "Bluetooth: report proper advertiser status on error" am: b509957e62
Jakub Pawlowski [Wed, 23 Nov 2016 02:03:13 +0000 (02:03 +0000)]
Merge "Bluetooth: report proper advertiser status on error" am: b509957e62
am: 673c0e5596

Change-Id: Ic91b1c614e9cc71e7d57bd39ac31ec1127f08f65

7 years agoMerge "Bluetooth: report proper advertiser status on error"
Jakub Pawlowski [Wed, 23 Nov 2016 01:58:03 +0000 (01:58 +0000)]
Merge "Bluetooth: report proper advertiser status on error"
am: b509957e62

Change-Id: I1bb0a029a9044c3931e158c7ef02ffee4cb0f1cd

7 years agoMerge "Bluetooth: report proper advertiser status on error"
Treehugger Robot [Wed, 23 Nov 2016 01:51:51 +0000 (01:51 +0000)]
Merge "Bluetooth: report proper advertiser status on error"

7 years agoExpose TelephonyManager#{set,get}DataEnabled.
Jeff Davidson [Fri, 18 Nov 2016 23:48:15 +0000 (15:48 -0800)]
Expose TelephonyManager#{set,get}DataEnabled.

setDataEnabled requires MODIFY_PHONE_STATE or carrier privileges.
getDataEnabled will work with any of the above or
ACCESS_NETWORK_STATE.

Merged-In: I2d5a9df2e55f3f7be1729abefe137c00ae1d6c4e
Test: Exercised APIs from test app, updated and executed CTS tests
Change-Id: I2d5a9df2e55f3f7be1729abefe137c00ae1d6c4e
Fixes: 32644451

7 years agoMerge "Expose TelephonyManager#{set,get}DataEnabled."
Jeff Davidson [Wed, 23 Nov 2016 01:23:46 +0000 (01:23 +0000)]
Merge "Expose TelephonyManager#{set,get}DataEnabled."

7 years agoMerge remote-tracking branch 'goog/cw-f-dev' into fix_merger
Baligh Uddin [Wed, 23 Nov 2016 01:19:45 +0000 (17:19 -0800)]
Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger

Bug: 32849428

* goog/cw-f-dev: (98 commits)
  Revert "Catch KeyStoreException for setting profile lock"
  Fix createConfirmDeviceCredentialIntent for wear for CTS.
  Fix default dialog background colour for watch devices.
  Catch KeyStoreException for setting profile lock
  Add cross-links between FINE and COARSE location permissions. bug: 25371600
  Fixed a bug with the emergency affordance in multi user
  Zygote: Additional whitelists for runtime overlay / other static resources.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Zygote : Block SIGCHLD during fork.
  colors: add missing accent_material_{700,50} resources.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Zygote : Block SIGCHLD during fork.
  DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"
  ...

Change-Id: I63468da5bfa21ed9ac5985bbdbf3a61d4c389aa0

7 years agoMerge "Add visibility table to account manager database."
TreeHugger Robot [Wed, 23 Nov 2016 00:09:48 +0000 (00:09 +0000)]
Merge "Add visibility table to account manager database."

7 years agoAdd test for TileUtils.
Fan Zhang [Tue, 22 Nov 2016 23:47:05 +0000 (15:47 -0800)]
Add test for TileUtils.

- Verify it skips non-system apps.
- Verify it parses category correctly.

Bug: 32460089
Test: make RunSettingsLibRoboTests
Change-Id: I743309206e1969dee4b1e62146be64eb4d143614

7 years agoMerge "Fix Skia render node projection to match HWUI"
TreeHugger Robot [Tue, 22 Nov 2016 23:43:21 +0000 (23:43 +0000)]
Merge "Fix Skia render node projection to match HWUI"

7 years agoMerge "Launch ephemeral intent"
TreeHugger Robot [Tue, 22 Nov 2016 22:53:45 +0000 (22:53 +0000)]
Merge "Launch ephemeral intent"

7 years agoMerge "Deprecate the activity recognition HAL."
Ashutosh Joshi [Tue, 22 Nov 2016 22:53:39 +0000 (22:53 +0000)]
Merge "Deprecate the activity recognition HAL."

7 years agoMerge "Implement tooltip support in View"
TreeHugger Robot [Tue, 22 Nov 2016 22:15:43 +0000 (22:15 +0000)]
Merge "Implement tooltip support in View"

7 years agoAdd visibility table to account manager database.
Dmitry Dementyev [Mon, 21 Nov 2016 21:51:27 +0000 (13:51 -0800)]
Add visibility table to account manager database.

Bug: https://b.corp.google.com/issues/33046496
Test: unit tests.
Change-Id: I92e94fb2185dbba965a5328048ada59fc2b5512a

7 years agoFix Skia render node projection to match HWUI
Stan Iliev [Tue, 8 Nov 2016 19:18:31 +0000 (14:18 -0500)]
Fix Skia render node projection to match HWUI

Fix Skia render node projection to match HWUI. Port
FrameBuilderTests_projectionReorder test for Skia pipeline.
Add new tests in both HWUI and Skia to cover more projection
use cases.

Test: built and run on angler-eng
Change-Id: Ibf27af211452ae95d595aca7723ea63f48b0b282

7 years agoBluetooth: report proper advertiser status on error
Jakub Pawlowski [Tue, 22 Nov 2016 20:44:22 +0000 (12:44 -0800)]
Bluetooth: report proper advertiser status on error

When advertiser is not started because too many advertisers are
registered, return proper error code.

Bug: 30622771
Test: sl4a ConcurrentBleAdvertisingTest
Change-Id: I57384ff30132e9a7ee17dcf191ff89baa7abf1ef

7 years agoMerge "Revert "Move Resource creation out of ContextImpl constructor""
Ian Pedowitz [Tue, 22 Nov 2016 21:29:57 +0000 (21:29 +0000)]
Merge "Revert "Move Resource creation out of ContextImpl constructor""

7 years agoLaunch ephemeral intent
Todd Kennedy [Tue, 22 Nov 2016 18:07:21 +0000 (10:07 -0800)]
Launch ephemeral intent

In MR1, the ephemeral application was launched via the supervisor.
In O, the ephemeral application is installed on the system as a
proper application and runs natively.

Bug: 30204367
Test: build & install the framework and run 'adb shell am start -a android.intent.action.VIEW -c android.intent.category.BROWSABLE -d "https://www.tripadvisor.com/Tourism-g33020-San_Jose_California-Vacations.html"'
Change-Id: Iea496862aeb72c6bfde439620950ba951d859cc7

7 years agoMove Resource creation out of ContextImpl constructor
Adam Lesinski [Sat, 19 Nov 2016 02:13:55 +0000 (18:13 -0800)]
Move Resource creation out of ContextImpl constructor

Resource creation is going to get much more nuanced
than just passing in a static set of paths, so move
the creation of Resources out to where the context
of the creation is more easily understood.
Test: Existing CTS tests pass

Change-Id: I49482bd637f305a5b953ddd39ff7390aa432f46b

7 years agoMerge "Use push/peek/pop for operations on stack"
TreeHugger Robot [Tue, 22 Nov 2016 20:53:27 +0000 (20:53 +0000)]
Merge "Use push/peek/pop for operations on stack"

7 years agoMerge "[CS] Remove timeout event after first available"
Etan Cohen [Tue, 22 Nov 2016 20:21:40 +0000 (20:21 +0000)]
Merge "[CS] Remove timeout event after first available"

7 years agoRevert "Move Resource creation out of ContextImpl constructor"
Adam Lesinski [Tue, 22 Nov 2016 19:41:55 +0000 (19:41 +0000)]
Revert "Move Resource creation out of ContextImpl constructor"

This reverts commit 16efc5e68d77903b84943bd9917bfd858332c183.

Caused issue with device protected settings: http://b/33066012

Change-Id: Ib485bed68ea8ac199d553b666c18d048a5624c98

7 years agoUse push/peek/pop for operations on stack
Fyodor Kupolov [Tue, 22 Nov 2016 19:02:07 +0000 (11:02 -0800)]
Use push/peek/pop for operations on stack

Test: manual - device boots, metrics are logged to system/event log
Bug: 32780225
Change-Id: If7e51c50767d8fd9d5da44f61dbc5bfe56196894

7 years agoMerge "Revert "Catch KeyStoreException for setting profile lock"" into nyc-mr1-dev...
Zach Jang [Tue, 22 Nov 2016 18:21:04 +0000 (18:21 +0000)]
Merge "Revert "Catch KeyStoreException for setting profile lock"" into nyc-mr1-dev am: d427da8a24 am: 466bb400bb am: 52a3542096
am: 4c428778c3

Change-Id: Ieac6a7b7a0676114d463b9f4fe24b230b416524f

7 years agoRevert "Catch KeyStoreException for setting profile lock" am: e61672ab08 am: fe3b0b2c...
Zach Jang [Tue, 22 Nov 2016 18:16:14 +0000 (18:16 +0000)]
Revert "Catch KeyStoreException for setting profile lock" am: e61672ab08 am: fe3b0b2cc1 am: f516131a38
am: af98d20dc6

Change-Id: Ib443a1fea735b8aa240d724fc7a24c91102440ef

7 years agoMerge "Revert "Catch KeyStoreException for setting profile lock"" into nyc-mr1-dev...
Zach Jang [Tue, 22 Nov 2016 18:14:21 +0000 (18:14 +0000)]
Merge "Revert "Catch KeyStoreException for setting profile lock"" into nyc-mr1-dev am: d427da8a24 am: 466bb400bb
am: 52a3542096

Change-Id: Ifa7aead1d53406409e5301724f44f8d7309e8911

7 years agoRevert "Catch KeyStoreException for setting profile lock" am: e61672ab08 am: fe3b0b2cc1
Zach Jang [Tue, 22 Nov 2016 18:08:35 +0000 (18:08 +0000)]
Revert "Catch KeyStoreException for setting profile lock" am: e61672ab08 am: fe3b0b2cc1
am: f516131a38

Change-Id: Ica7d8825fb973e288270e21345066a675818836e

7 years agoMerge "Revert "Catch KeyStoreException for setting profile lock"" into nyc-mr1-dev...
Zach Jang [Tue, 22 Nov 2016 18:04:13 +0000 (18:04 +0000)]
Merge "Revert "Catch KeyStoreException for setting profile lock"" into nyc-mr1-dev am: d427da8a24
am: 466bb400bb

Change-Id: I49c4ed53cb2341d34855d53f5e66a95a7c0130af

7 years agoRevert "Catch KeyStoreException for setting profile lock" am: e61672ab08
Zach Jang [Tue, 22 Nov 2016 18:03:27 +0000 (18:03 +0000)]
Revert "Catch KeyStoreException for setting profile lock" am: e61672ab08
am: fe3b0b2cc1

Change-Id: Iba7288ba01872f804a22814f4615b202010d7194

7 years agoMerge "Revert "Catch KeyStoreException for setting profile lock"" into nyc-mr1-dev
Zach Jang [Tue, 22 Nov 2016 17:59:02 +0000 (17:59 +0000)]
Merge "Revert "Catch KeyStoreException for setting profile lock"" into nyc-mr1-dev
am: d427da8a24

Change-Id: I8a4f01466e4b93782478e94240f2c8f2d74972ad

7 years agoRevert "Catch KeyStoreException for setting profile lock"
Zach Jang [Tue, 22 Nov 2016 17:58:58 +0000 (17:58 +0000)]
Revert "Catch KeyStoreException for setting profile lock"
am: e61672ab08

Change-Id: Ie1a720181bf542bbf213af8b6b83eff0ecd84a98

7 years agoMerge "Add SystemProperties.reportSyspropChanged()." am: 45c0c6939f am: 8c05ff96fb...
Martijn Coenen [Tue, 22 Nov 2016 17:55:47 +0000 (17:55 +0000)]
Merge "Add SystemProperties.reportSyspropChanged()." am: 45c0c6939f am: 8c05ff96fb am: 201cf4fb27
am: d42b1d01ca

Change-Id: I05410af5c0e9fe0807d6198aa5c6bdc2eb745ff8

7 years agoMerge "wifi: hotspot2: add copy constructor for PasspointConfiguration" am: 248c8311e...
Peter Qiu [Tue, 22 Nov 2016 17:52:57 +0000 (17:52 +0000)]
Merge "wifi: hotspot2: add copy constructor for PasspointConfiguration" am: 248c8311e8 am: 3aa7fdd19a am: 5366e9bf71
am: f598da48f2

Change-Id: I005042e2acf5f53fd70373443f7763b68d783f0f

7 years agoMerge "Revert "Catch KeyStoreException for setting profile lock"" into nyc-mr1-dev
Zach Jang [Tue, 22 Nov 2016 17:51:57 +0000 (17:51 +0000)]
Merge "Revert "Catch KeyStoreException for setting profile lock"" into nyc-mr1-dev

7 years agoMerge "Make voicemail notification broadcast public" am: 6a56326109 am: 9b614baeab...
Ta-wei Yen [Tue, 22 Nov 2016 17:50:53 +0000 (17:50 +0000)]
Merge "Make voicemail notification broadcast public" am: 6a56326109 am: 9b614baeab am: f05c651c99
am: dcb9f3c8ed

Change-Id: I0d5e582d5e145c59ee1f24258c74549ec0acf7aa

7 years agoRevert "Catch KeyStoreException for setting profile lock"
Zach Jang [Tue, 22 Nov 2016 17:47:18 +0000 (17:47 +0000)]
Revert "Catch KeyStoreException for setting profile lock"

This reverts commit c8fa5ed8f2d492aa5e005fcdb5991c3f980de045.

Change-Id: Ia1425e649e102cb79280d75e5f49db670214cec3

7 years agoMerge "Additional boot metrics"
Fyodor Kupolov [Tue, 22 Nov 2016 17:44:58 +0000 (17:44 +0000)]
Merge "Additional boot metrics"

7 years agoImplement tooltip support in View
Vladislav Kaznacheev [Mon, 21 Nov 2016 22:11:00 +0000 (14:11 -0800)]
Implement tooltip support in View

Adding View.setTooltip/getTooltip and 'tooltip' layout attribute.
Following Material Design spec for styles and behavior.

Bug: 31515376
Test:  cts-tradefed run singleCommand cts -m CtsViewTestCases
  --test android.view.cts.TooltipTest

Change-Id: I2d2527f642cd7446ffc88d4beffc7b81d7a2f6d6

7 years agoMerge "Define stream type for accessibility volume control"
Jean-Michel Trivi [Tue, 22 Nov 2016 16:28:44 +0000 (16:28 +0000)]
Merge "Define stream type for  accessibility volume control"

7 years agoMerge "Add ACTION_WIFI_SAVED_NETWORK_SETTINGS to Settings."
TreeHugger Robot [Tue, 22 Nov 2016 14:59:31 +0000 (14:59 +0000)]
Merge "Add ACTION_WIFI_SAVED_NETWORK_SETTINGS to Settings."

7 years agoMerge "WindowList be gone!"
Wale Ogunwale [Tue, 22 Nov 2016 14:56:44 +0000 (14:56 +0000)]
Merge "WindowList be gone!"

7 years agoIntroduce TextAssistant for Smart Text Share feature.
Abodunrinwa Toki [Mon, 21 Nov 2016 18:41:02 +0000 (18:41 +0000)]
Introduce TextAssistant for Smart Text Share feature.

Bug: 30982298
Test: CTS tests to be added in a follow up CL.
Future CLs will add implementation detail.

Change-Id: Iad550447a4b3552340c0ada75fda60f97f0913aa

7 years agoMerge "Change EXTRA_TIME_PREF_24_HOUR_FORMAT from boolean to int"
Neil Fuller [Tue, 22 Nov 2016 11:55:21 +0000 (11:55 +0000)]
Merge "Change EXTRA_TIME_PREF_24_HOUR_FORMAT from boolean to int"

7 years agoMerge "Add SystemProperties.reportSyspropChanged()." am: 45c0c6939f am: 8c05ff96fb
Martijn Coenen [Tue, 22 Nov 2016 10:00:36 +0000 (10:00 +0000)]
Merge "Add SystemProperties.reportSyspropChanged()." am: 45c0c6939f am: 8c05ff96fb
am: 201cf4fb27

Change-Id: Ibd379f588dacbf571948d34d76abb0e6f12f3a79

7 years agoMerge "Add SystemProperties.reportSyspropChanged()." am: 45c0c6939f
Martijn Coenen [Tue, 22 Nov 2016 09:55:03 +0000 (09:55 +0000)]
Merge "Add SystemProperties.reportSyspropChanged()." am: 45c0c6939f
am: 8c05ff96fb

Change-Id: Ib406f48dc35ecededd89ed8ed8750622a26d9ee2

7 years agoMerge "Add SystemProperties.reportSyspropChanged()."
Martijn Coenen [Tue, 22 Nov 2016 09:49:15 +0000 (09:49 +0000)]
Merge "Add SystemProperties.reportSyspropChanged()."
am: 45c0c6939f

Change-Id: I83890872ba76161cf2f9a35b23861ab21b452a0f

7 years agoMerge "Add SystemProperties.reportSyspropChanged()."
Treehugger Robot [Tue, 22 Nov 2016 09:43:23 +0000 (09:43 +0000)]
Merge "Add SystemProperties.reportSyspropChanged()."

7 years agoMerge "wifi: hotspot2: add copy constructor for PasspointConfiguration" am: 248c8311e...
Peter Qiu [Tue, 22 Nov 2016 01:48:56 +0000 (01:48 +0000)]
Merge "wifi: hotspot2: add copy constructor for PasspointConfiguration" am: 248c8311e8 am: 3aa7fdd19a
am: 5366e9bf71

Change-Id: I9fc34e4df6ede509d954a0973f438e18f25693f0

7 years agoMerge "Make voicemail notification broadcast public" am: 6a56326109 am: 9b614baeab
Ta-wei Yen [Tue, 22 Nov 2016 01:45:21 +0000 (01:45 +0000)]
Merge "Make voicemail notification broadcast public" am: 6a56326109 am: 9b614baeab
am: f05c651c99

Change-Id: I8b8edb79ff63eeae8ace939ad278157032b8ded7

7 years agoMerge "wifi: hotspot2: add copy constructor for PasspointConfiguration" am: 248c8311e8
Peter Qiu [Tue, 22 Nov 2016 01:43:48 +0000 (01:43 +0000)]
Merge "wifi: hotspot2: add copy constructor for PasspointConfiguration" am: 248c8311e8
am: 3aa7fdd19a

Change-Id: Icab9addb14ba68e6878f208b14cde9f54ea3cb85

7 years agoMerge "Make voicemail notification broadcast public" am: 6a56326109
Ta-wei Yen [Tue, 22 Nov 2016 01:38:56 +0000 (01:38 +0000)]
Merge "Make voicemail notification broadcast public" am: 6a56326109
am: 9b614baeab

Change-Id: Icb636f5155c3b25a3db2978fad830fb94b959a2f

7 years agoMerge "wifi: hotspot2: add copy constructor for PasspointConfiguration"
Peter Qiu [Tue, 22 Nov 2016 01:37:00 +0000 (01:37 +0000)]
Merge "wifi: hotspot2: add copy constructor for PasspointConfiguration"
am: 248c8311e8

Change-Id: I9a652a0f02f2895bde3ac9e4c332c80fc38b0df6

7 years agoMerge "Make voicemail notification broadcast public"
Ta-wei Yen [Tue, 22 Nov 2016 01:32:00 +0000 (01:32 +0000)]
Merge "Make voicemail notification broadcast public"
am: 6a56326109

Change-Id: Ic094db50e40a0cd46251e27f84b2a98b9040a192

7 years agoAdditional boot metrics
Fyodor Kupolov [Thu, 17 Nov 2016 19:44:49 +0000 (11:44 -0800)]
Additional boot metrics

Extracted duration measurement functionality into BootTimingTraceLog.
It is now shared between system_server and zygote.

Log the following metrics to tron:
- boot_zygote_init - Time in milliseconds to boot into Zygote init stage.
- boot_android_init - Time in milliseconds to boot into Android init stage.

Test: manual - device boots, metrics are logged to system/event log
Bug: 32780225
Bug: 31115337
Change-Id: I600ac7fc83d35fa226ac92c37cc4b19192b25f59

7 years agoAdd int[] JNI benchmarks
John Reck [Mon, 21 Nov 2016 23:23:34 +0000 (15:23 -0800)]
Add int[] JNI benchmarks

Test: Ran benchmarks
Change-Id: I5faf4236a431199976abb0719c56904dabbbf54d

7 years agoMerge "wifi: hotspot2: add copy constructor for PasspointConfiguration"
Treehugger Robot [Tue, 22 Nov 2016 00:03:43 +0000 (00:03 +0000)]
Merge "wifi: hotspot2: add copy constructor for PasspointConfiguration"

7 years agoMerge "Presubmit test for PackageManager"
Fyodor Kupolov [Mon, 21 Nov 2016 23:57:56 +0000 (23:57 +0000)]
Merge "Presubmit test for PackageManager"

7 years agoMerge "Cleanup ContexthubService implementation"
Ashutosh Joshi [Mon, 21 Nov 2016 23:39:49 +0000 (23:39 +0000)]
Merge "Cleanup ContexthubService implementation"

7 years agoDefine stream type for accessibility volume control
Jean-Michel Trivi [Fri, 11 Nov 2016 18:05:18 +0000 (10:05 -0800)]
Define stream type for  accessibility volume control

New stream type for accessibility volume.
Add related appOps.

Test: see added CTS tests in AudioManagerTest & Stub
Bug 30448020

Change-Id: I34f96713b22fedf75322b8ffe2b96a7c566f5009

7 years agoMerge "[AWARE] Update API per review" am: 9e4f111e0f am: ce7f932be7 am: 86cd994a15
Etan Cohen [Mon, 21 Nov 2016 23:07:34 +0000 (23:07 +0000)]
Merge "[AWARE] Update API per review" am: 9e4f111e0f am: ce7f932be7 am: 86cd994a15
am: 355e52215f

Change-Id: I0f334e1db798bdfcadb4547d7edda5200e160b43

7 years agoMerge "StrictMode to detect untagged network traffic." am: 67fe28d925 am: db5ed5beb1...
Jeff Sharkey [Mon, 21 Nov 2016 23:05:12 +0000 (23:05 +0000)]
Merge "StrictMode to detect untagged network traffic." am: 67fe28d925 am: db5ed5beb1 am: 3391f3376e
am: 55727aaede

Change-Id: I272964fc9c2a9e350bacc0586dd6b2d4a23c5f51

7 years agoMerge "Stub Binder API." am: 4db1632b3a am: 313456c975 am: c61a8e01a3
Jeff Sharkey [Mon, 21 Nov 2016 23:03:55 +0000 (23:03 +0000)]
Merge "Stub Binder API." am: 4db1632b3a am: 313456c975 am: c61a8e01a3
am: 8984897502  -s ours

Change-Id: Ib052b3afcf046786732d8084188d7fbec9805215

7 years agoMerge "Added 'oneway' flags on AIDL where appliable."
TreeHugger Robot [Mon, 21 Nov 2016 23:00:38 +0000 (23:00 +0000)]
Merge "Added 'oneway' flags on AIDL where appliable."

7 years agoMerge "Merge "Fix createConfirmDeviceCredentialIntent for wear for CTS." into cw...
Android Build Merger (Role) [Mon, 21 Nov 2016 22:56:49 +0000 (22:56 +0000)]
Merge "Merge "Fix createConfirmDeviceCredentialIntent for wear for CTS." into cw-f-dev am: f9154e923b am: de098d013c am: f8ab89c514"

7 years agoMerge "Move Resource creation out of ContextImpl constructor"
Adam Lesinski [Mon, 21 Nov 2016 22:56:14 +0000 (22:56 +0000)]
Merge "Move Resource creation out of ContextImpl constructor"