OSDN Git Service
Steven Thomas [Wed, 15 Nov 2017 19:47:52 +0000 (19:47 +0000)]
Merge "Turn on the "use standby to exit vr mode" feature"
TreeHugger Robot [Wed, 15 Nov 2017 19:45:37 +0000 (19:45 +0000)]
Merge "Fixed typo in MergeCursor"
Winson Chung [Wed, 15 Nov 2017 19:32:25 +0000 (19:32 +0000)]
Merge "Support for setting stack windowing mode"
Niklas Brunlid [Wed, 15 Nov 2017 19:16:47 +0000 (19:16 +0000)]
Merge "Avoid overflow in focus fudge calculation" am:
795d4a5aa4 am:
e842e266a6
am:
858c934b5d
Change-Id: I80d027ca4adffbc18b95c365d9ed27d9faaefccd
Niklas Brunlid [Wed, 15 Nov 2017 19:08:30 +0000 (19:08 +0000)]
Merge "Avoid overflow in focus fudge calculation" am:
795d4a5aa4
am:
e842e266a6
Change-Id: I0509b4debdf634075df7d8f63516d0b8e18e4b8c
Niklas Brunlid [Wed, 15 Nov 2017 18:59:35 +0000 (18:59 +0000)]
Merge "Avoid overflow in focus fudge calculation"
am:
795d4a5aa4
Change-Id: Id15034f5a02f93a4fe8487b5516993a9bf6f4ada
TreeHugger Robot [Wed, 15 Nov 2017 18:47:27 +0000 (18:47 +0000)]
Merge changes from topic "f2fs_gc"
* changes:
Run gc + fstrim for idle maintenance
Add 'idle-maint' command for use from shell
Add entry points to invoke idle maintenance from vold
Treehugger Robot [Wed, 15 Nov 2017 18:42:28 +0000 (18:42 +0000)]
Merge "Avoid overflow in focus fudge calculation"
Marie Janssen [Wed, 15 Nov 2017 18:37:43 +0000 (18:37 +0000)]
Merge "Bluetooth: Use elapsed real time for calculating onDuration" am:
22b12e6b06 am:
e57c02e860
am:
4a59e56a34
Change-Id: I3038e805004af042ba61cdf4717bbfd192688a04
Marie Janssen [Wed, 15 Nov 2017 18:24:50 +0000 (18:24 +0000)]
Merge "Bluetooth: Use elapsed real time for calculating onDuration" am:
22b12e6b06
am:
e57c02e860
Change-Id: If51a8d59d621cc9578d95df7d86903cec5628935
TreeHugger Robot [Wed, 15 Nov 2017 18:15:54 +0000 (18:15 +0000)]
Merge "Allow read-access to notification policy"
Marie Janssen [Wed, 15 Nov 2017 18:11:38 +0000 (18:11 +0000)]
Merge "Bluetooth: Use elapsed real time for calculating onDuration"
am:
22b12e6b06
Change-Id: Ide20da5af6ea64f1c5c0e325e8864034798eface
TreeHugger Robot [Wed, 15 Nov 2017 17:10:55 +0000 (17:10 +0000)]
Merge "Persist notification blocker info across reboots"
Treehugger Robot [Wed, 15 Nov 2017 17:06:41 +0000 (17:06 +0000)]
Merge "Bluetooth: Use elapsed real time for calculating onDuration"
Beverly [Wed, 15 Nov 2017 16:12:51 +0000 (11:12 -0500)]
Allow read-access to notification policy
Test: manual
Change-Id: I2b3c597b56f910b3bcad902e08f6f432493ce768
Fixes:
69358003
Bryce Lee [Wed, 15 Nov 2017 15:47:24 +0000 (15:47 +0000)]
Merge changes I93fef3dc,I19647b24
* changes:
Add tests to exercise ActivityStarter precondition failures.
Make ActivityStackSupervisor instrumentable for unit tests.
Wale Ogunwale [Thu, 9 Nov 2017 16:28:45 +0000 (08:28 -0800)]
Support for setting stack windowing mode
We currently create a in stack in the windowing mode we want anytime we
want to change the windowing mode of a task which isn't optimal.
We now change the current stack windowing mode for some cases vs.
creating a new stack.
Test: go/wm-smoke
Bug:
64146578
Fixes:
68948655
Fixes:
65739235
Fixes:
29068935
Change-Id: I9fceb7d608e86610c1fb5ba59b15087a96e7401e
Rubin Xu [Wed, 15 Nov 2017 14:33:36 +0000 (14:33 +0000)]
Merge "Delete synthetic password keystore keys when user is removed."
Rubin Xu [Fri, 15 Sep 2017 10:56:53 +0000 (11:56 +0100)]
Delete synthetic password keystore keys when user is removed.
Bug:
65718620
Test: Add user, remove user, look at "adb shell su 1000 keystore_cli_v2 list"
and make sure nothing remains.
Change-Id: I2cf862c35117faed38fdfe5c43ceece4e8dbc3c4
Marie Janssen [Mon, 26 Jun 2017 14:21:03 +0000 (07:21 -0700)]
Bluetooth: Use elapsed real time for calculating onDuration
The system time can change after boot. Using elapsed real time avoids
this problem.
Test: start factory reset device, adb shell dumpsys bluetooth_manager
Change-Id: Ieea2a2bc8b4bcb375897e609275207b6c3eccdce
Fixes:
62985817
TreeHugger Robot [Wed, 15 Nov 2017 08:47:54 +0000 (08:47 +0000)]
Merge "Widget types for unselectable and custom views"
TreeHugger Robot [Wed, 15 Nov 2017 04:52:45 +0000 (04:52 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 15 Nov 2017 04:05:58 +0000 (04:05 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 15 Nov 2017 03:43:30 +0000 (03:43 +0000)]
Merge "Extend FeatureFlagUtils to take a context object."
Bill Yi [Wed, 15 Nov 2017 03:40:11 +0000 (03:40 +0000)]
Import translations. DO NOT MERGE am:
16277b2ac0 -s ours
am:
46f7b91ed8 -s ours
Change-Id: Ifd1266ecc2e1cb794807b1b7f6a258e6f98ef546
Bill Yi [Wed, 15 Nov 2017 03:32:04 +0000 (03:32 +0000)]
Import translations. DO NOT MERGE
am:
16277b2ac0 -s ours
Change-Id: Ibcda38cf1604c2eb125a6d42643cd43ea2736924
TreeHugger Robot [Wed, 15 Nov 2017 03:09:45 +0000 (03:09 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 15 Nov 2017 03:05:18 +0000 (03:05 +0000)]
Merge "Implement System Properties Section"
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
TreeHugger Robot [Wed, 15 Nov 2017 02:52:53 +0000 (02:52 +0000)]
Merge "Implement intent to uri mapping for slices"
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
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
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
Treehugger Robot [Wed, 15 Nov 2017 02:23:27 +0000 (02:23 +0000)]
Merge "Remove AutofillManagerClient after AutofillManager is finalized"
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
TreeHugger Robot [Wed, 15 Nov 2017 01:16:38 +0000 (01:16 +0000)]
Merge "Use callback to run binder service to avoid race"
TreeHugger Robot [Wed, 15 Nov 2017 01:09:06 +0000 (01:09 +0000)]
Merge "Enforce REQUEST_DELETE_PACKAGES for PackageInstaller.uninstall()"
Fan Zhang [Tue, 14 Nov 2017 01:38:53 +0000 (17:38 -0800)]
Extend FeatureFlagUtils to take a context object.
It's not used by anything yet, but will eventually be used to query
feature override from different data sources (such as Settings.Global)
Bug:
36222960
Test: atest
Change-Id: Ie32f7c59b4a27199da72d8c9fbfdd1aeee6c0b34
Bill Yi [Wed, 15 Nov 2017 01:05:12 +0000 (17:05 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ibccdfc57a7fa4d1dae4d25ead94059836d54262c
Auto-generated-cl: translation import
TreeHugger Robot [Wed, 15 Nov 2017 00:52:21 +0000 (00:52 +0000)]
Merge "Dump the overview proxy service information"
TreeHugger Robot [Wed, 15 Nov 2017 00:33:11 +0000 (00:33 +0000)]
Merge "Fix NullPointerException in CustomEditTextPreference."
Jong Wook Kim [Wed, 15 Nov 2017 00:25:13 +0000 (00:25 +0000)]
Merge "WPS Metrics Added to wifi.proto"
Aurimas Liutikas [Wed, 15 Nov 2017 00:23:39 +0000 (00:23 +0000)]
Merge "Fix import of android-support-annotations"
Fyodor Kupolov [Tue, 14 Nov 2017 23:50:24 +0000 (15:50 -0800)]
Fixed typo in MergeCursor
Test: n/a
Bug:
68247902
Change-Id: I484d3aa23415769b205635908f7d73d8113d866b
Bill Yi [Tue, 14 Nov 2017 23:52:57 +0000 (15:52 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I919a3f3b5178a31b309ba22c593d5a16875a6e74
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
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
Jin Qian [Wed, 25 Oct 2017 00:48:00 +0000 (17:48 -0700)]
Run gc + fstrim for idle maintenance
Test:
adb shell cmd jobscheduler get-job-state android 808
adb shell cmd jobscheduler run android 808
adb shell cmd jobscheduler timeout android 808
Bug:
67776637
Change-Id: I8e0d01891a689f9a9181160611657e2cda531c0f
Jin Qian [Tue, 17 Oct 2017 22:51:50 +0000 (15:51 -0700)]
Add 'idle-maint' command for use from shell
Test: adb shell sm idle-maint [run|abort]
Bug:
67776637
Change-Id: I5f20adc45aad29dc9267a70bf3eea6a1fa490688
Jin Qian [Tue, 17 Oct 2017 22:48:18 +0000 (15:48 -0700)]
Add entry points to invoke idle maintenance from vold
Test: adb shell sm idle-maint [run|abort]
Bug:
67776637
Change-Id: Ibc686a318f6f79a4f8303f56451bc1d573d829e8
TreeHugger Robot [Tue, 14 Nov 2017 22:58:08 +0000 (22:58 +0000)]
Merge "Make ic_print and ic_print_error vector graphics"
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
Bryce Lee [Wed, 25 Oct 2017 22:54:55 +0000 (15:54 -0700)]
Add tests to exercise ActivityStarter precondition failures.
This changelist adds tests which simulate various scenarios
encountered during the initial stages of starting an activity. They
ensure that the expected errors are returned under specified
conditions.
Bug:
64750076
Test: bit FrameworksServicesTests:com.android.server.am.ActivityStarterTests
Change-Id: I93fef3dce020fe03a8b2001b75a875980506a0dd
Bryce Lee [Fri, 27 Oct 2017 17:57:35 +0000 (10:57 -0700)]
Make ActivityStackSupervisor instrumentable for unit tests.
Currently, the ActivityStackSupervisor passes an instance of itself
during construction to a number of its member variables. Passing
a self reference at this time leads to an incomplete object being
passed. In the case of testing, it's possible for the instance to be
copied after construction for instrumentation, leading to the
original instance being retained.
This changelist addresses this by moving the creation of these
variables to a separate initialize methods. In addition, the affected
variables accessed outside the class are now behind accessors to
prevent their modification.
Bug:
64750076
Test: bit FrameworksServicesTests:com.android.server.am.ActivityStarterTests
Test: bit FrameworksServicesTests:com.android.server.am.ActivityStackSupervisorTests
Test: bit FrameworksServicesTests:com.android.server.am.ActivityStackTests
Test: bit FrameworksServicesTests:com.android.server.am.LaunchingBoundsControllerTests
Test: bit FrameworksServicesTests:com.android.server.am.LaunchingActivityPositionerTests
Test: bit FrameworksServicesTests:com.android.server.am.LaunchingTaskPositionerTests
Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/am/RecentTasksTest.java
Change-Id: I19647b24925b82db0ab0955585d7588a28e00f94
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
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
Selim Cinek [Tue, 14 Nov 2017 22:19:32 +0000 (22:19 +0000)]
Merge "Dissallow Heads up when redacted"
Stefan Lafon [Tue, 14 Nov 2017 22:03:54 +0000 (22:03 +0000)]
Merge "Rename "stats_events" as "atom"."
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
TreeHugger Robot [Tue, 14 Nov 2017 21:56:07 +0000 (21:56 +0000)]
Merge "Add hints for toggles in Slice"
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
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
TreeHugger Robot [Tue, 14 Nov 2017 21:21:48 +0000 (21:21 +0000)]
Merge "Convert SettingsLib Lifecycle to Flatfoot"
TreeHugger Robot [Tue, 14 Nov 2017 20:58:51 +0000 (20:58 +0000)]
Merge "Fix focusfinder coretests"
TreeHugger Robot [Tue, 14 Nov 2017 20:54:00 +0000 (20:54 +0000)]
Merge "Disable skia shader cache"
Julia Reynolds [Tue, 7 Nov 2017 14:04:58 +0000 (09:04 -0500)]
Persist notification blocker info across reboots
Also update the rule for when streaks can be reset.
Bug:
63095540
Test: make ExtServicesUnitTests &&
adb install -r $OUT/data/app/ExtServicesUnitTests/ExtServicesUnitTests.apk &&
adb shell am instrument -w android.ext.services.tests.unit/android.support.test.runner.AndroidJUnitRunner
Change-Id: Ie5eb0d5b3dfef8f6d9089bead0307a4c457ca30c
Peter Visontay [Tue, 14 Nov 2017 20:33:13 +0000 (20:33 +0000)]
Merge "In GnssLocationProvider wrap Binder.restoreCallingIdentity() in finally{}."
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
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
yinxu [Tue, 14 Nov 2017 20:25:16 +0000 (20:25 +0000)]
Merge "Fix the comments of onError() callback"
am:
5f291e5e06
Change-Id: If034888c0baeaae882e150eff477083974541541
TreeHugger Robot [Tue, 14 Nov 2017 20:25:09 +0000 (20:25 +0000)]
Merge "Adds client API for interacting with statsd."
Treehugger Robot [Tue, 14 Nov 2017 20:12:02 +0000 (20:12 +0000)]
Merge "Fix the comments of onError() callback"
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
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
Bill Yi [Tue, 14 Nov 2017 19:55:41 +0000 (11:55 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ief59ff33832adab3b23a26794c2bce28f6cc5c54
Auto-generated-cl: translation import
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
Tianran Li [Tue, 14 Nov 2017 19:47:34 +0000 (19:47 +0000)]
Merge "TimePickerDialog OTG keyboard entry discarded"
am:
8c2cb6ff08
Change-Id: Ib28468e637c146e69d59ee352b5a019654b3dc14
Treehugger Robot [Tue, 14 Nov 2017 19:35:20 +0000 (19:35 +0000)]
Merge "TimePickerDialog OTG keyboard entry discarded"
Aurimas Liutikas [Tue, 14 Nov 2017 01:41:39 +0000 (01:41 +0000)]
Fix import of android-support-annotations
Bug:
69161825
Change-Id: I647516330d9990869f78084e2d393742000e836b
TreeHugger Robot [Tue, 14 Nov 2017 19:21:01 +0000 (19:21 +0000)]
Merge "Fix some mouse + list-item selection/scrolling issues"
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
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
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
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
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
TreeHugger Robot [Tue, 14 Nov 2017 18:41:50 +0000 (18:41 +0000)]
Merge "Allow assistant app to access any shortcuts"
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
Jeffrey Huang [Tue, 14 Nov 2017 18:11:13 +0000 (18:11 +0000)]
Merge "Use uname instead of proc/version"
Fyodor Kupolov [Tue, 14 Nov 2017 17:53:06 +0000 (17:53 +0000)]
Merge "Apps can now specify journal/synchronous mode"
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
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
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
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"
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
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
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"
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
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
Etan Cohen [Tue, 14 Nov 2017 17:00:14 +0000 (17:00 +0000)]
Merge "[RTT2] Add WorkSource APIs to request/cancel ranging ops"
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