OSDN Git Service
Daniel Nishi [Tue, 7 Mar 2017 22:55:16 +0000 (22:55 +0000)]
Merge "Use the fast track for the AppCollector."
TreeHugger Robot [Tue, 7 Mar 2017 22:47:17 +0000 (22:47 +0000)]
Merge "Revert "Start locking down /data/media access.""
Fyodor Kupolov [Tue, 7 Mar 2017 22:42:25 +0000 (22:42 +0000)]
Merge "Throw exception if slot has invalid offset"
Amith Yamasani [Tue, 7 Mar 2017 22:40:45 +0000 (22:40 +0000)]
Merge "Collect background network data stats in BatteryStats"
TreeHugger Robot [Tue, 7 Mar 2017 22:19:47 +0000 (22:19 +0000)]
Merge changes from topic 'b/
34853980'
* changes:
Camera: Add createCustomCameraSession to system API.
CameraDevice: Add hidden createCustomCaptureSession
Hall Liu [Tue, 7 Mar 2017 22:05:00 +0000 (22:05 +0000)]
Merge "Add further Connection-side APIs for RTT (part 2)" am:
6bb5110f2c am:
033972b5b2
am:
3a2c5f3f06
Change-Id: Ib400c621c0fa9f241af711bedd7d36f0fc95f7c4
Hall Liu [Tue, 7 Mar 2017 21:57:15 +0000 (21:57 +0000)]
Merge "Add further Connection-side APIs for RTT (part 2)" am:
6bb5110f2c
am:
033972b5b2
Change-Id: If2e4cd4eb08e15750886454102adf0b807852509
Hall Liu [Tue, 7 Mar 2017 21:52:52 +0000 (21:52 +0000)]
Merge "Add further Connection-side APIs for RTT (part 2)"
am:
6bb5110f2c
Change-Id: Idfe092393301fb47e6a635eb150103cb928a2696
Hall Liu [Tue, 7 Mar 2017 21:44:42 +0000 (21:44 +0000)]
Merge "Add further Connection-side APIs for RTT (part 2)"
Calin Juravle [Tue, 7 Mar 2017 21:35:15 +0000 (21:35 +0000)]
Merge "PackageManager: Clean up code related to foreign dex use" am:
eef66fd0c7 am:
b1818b8a36
am:
d89f0f7c44 -s ours
Change-Id: I1a31c374c1ed665b0bdae6c4169e50fa40f70906
TreeHugger Robot [Tue, 7 Mar 2017 21:31:01 +0000 (21:31 +0000)]
Merge "fallout of splitting libsensor out of libgui"
Calin Juravle [Tue, 7 Mar 2017 21:27:14 +0000 (21:27 +0000)]
Merge "PackageManager: Clean up code related to foreign dex use" am:
eef66fd0c7
am:
b1818b8a36
Change-Id: I41008c4e95cef971702120be285c2a8821168591
Julia Reynolds [Fri, 3 Mar 2017 13:59:53 +0000 (08:59 -0500)]
Allow channels to be renamed.
Because string resource ids aren't stable.
Test: runtest systemui-notification
Change-Id: Iaaa07b8c8cc1c8c321c7fedbfe1e252b4c1153dd
Calin Juravle [Tue, 7 Mar 2017 21:23:03 +0000 (21:23 +0000)]
Merge "PackageManager: Clean up code related to foreign dex use"
am:
eef66fd0c7
Change-Id: I443f001c15daddd63a17685c2e82fc9a619c45ee
Jeff Sharkey [Tue, 7 Mar 2017 21:20:03 +0000 (14:20 -0700)]
Revert "Start locking down /data/media access."
Caused b/
35926593 because ExternalStorageProvider needs raw
access to underlying devices that aren't mounted visibly, like
USB mass storage devices.
This reverts commit
53d64fc839ad79be28d783f0f14082310a647dd9.
TreeHugger Robot [Tue, 7 Mar 2017 21:18:14 +0000 (21:18 +0000)]
Merge "Throw SecurityException in sendVisualVoicemailSms()"
Calin Juravle [Tue, 7 Mar 2017 21:13:14 +0000 (21:13 +0000)]
Merge "PackageManager: Clean up code related to foreign dex use"
Doris Liu [Tue, 7 Mar 2017 21:01:43 +0000 (21:01 +0000)]
Merge "Ensure behavior consistency for 0 duration scale"
Adrian Roos [Tue, 7 Mar 2017 20:53:21 +0000 (20:53 +0000)]
Merge "Revert "AOD: Refactor always on configuration""
TreeHugger Robot [Tue, 7 Mar 2017 20:42:26 +0000 (20:42 +0000)]
Merge "AAPT2: Add --package-id flag for feature-split suppport"
Stephen Chen [Tue, 7 Mar 2017 20:41:14 +0000 (20:41 +0000)]
Merge "Create a Tron event for opening the network scorer settings page."
Adrian Roos [Tue, 7 Mar 2017 20:20:35 +0000 (20:20 +0000)]
Revert "AOD: Refactor always on configuration"
This reverts commit
28d26a821f5fa078af756ceb3e94090a10f73175.
Bug:
36027947
Change-Id: I3d4c2e58b753120ff668a4594f60692abc6a3426
TreeHugger Robot [Tue, 7 Mar 2017 20:21:23 +0000 (20:21 +0000)]
Merge "Retry SECURITY_LOGS_AVAILABLE if DO doesn't request the logs"
Calin Juravle [Sat, 4 Mar 2017 01:04:55 +0000 (17:04 -0800)]
PackageManager: Clean up code related to foreign dex use
We simplified the way we track whether or not a dex file is used by
other apps. DexManager in the framework keeps track of the data and we
no longer need file markers on disk.
Test: device boots, foreign dex markers are not created anymore
Bug:
32871170
(cherry picked from commit
74f0a3450cd598f52b2c68c43531b1a27fb4e1ce)
Change-Id: I2a9daca15e5120518852584fa17aa94012af8f1a
Merged-In: I3660e2f3913a73904181449c2d910af0a0477950
TreeHugger Robot [Tue, 7 Mar 2017 19:14:50 +0000 (19:14 +0000)]
Merge "Enable escrow tokens on automotive builds."
Filip Pavlis [Tue, 7 Mar 2017 19:09:46 +0000 (19:09 +0000)]
Merge "Fix home/back buttons flow in PreferenceActivity."
Adam Lesinski [Sat, 4 Mar 2017 00:33:26 +0000 (16:33 -0800)]
AAPT2: Add --package-id flag for feature-split suppport
Bug:
35928935
Change-Id: Ia8496505e61cfcfdb8f9f62366d2f36e453db111
Test: make aapt2_tests
Filip Pavlis [Wed, 1 Mar 2017 13:48:33 +0000 (13:48 +0000)]
Fix home/back buttons flow in PreferenceActivity.
Bug: b/
35977048
Test: Done manually. Automated test will be added later.
After recent changes in PreferenceActivity finishing the activity on
pressing back is not correct anymore. Instead onBackButton method should
be called to deal with it (we have fragments transactions for instance).
There can be multiple buttons:
1. The native default one - calls onBackPressed by default so no extra work
needed.
2. PreferenceActivity has buttons that can de displayed when settting
EXTRA_PREFS_SHOW_BUTTON_BAR to true. But it is a private API and I
didn't find any usage of it, so there is no need to change that. Also
it looks like something very specific used in WiFi wizards.
3. Apps often use a toolbar that has a home button which essentialy
emulates back button. The issue is that this Activity never had support
for this. So apps had to override onOptionsItemSelected and some of
those are unfortunately calling finish() which worked previously when
PreferenceActivity wasn't using fragments in single pane. This CL adds
support so app will no longer need to override that method and some
apps need to be instructed to use that override in O.
Change-Id: I94f557edb2e03f89fbf02e800beb390b2ad0544f
Doris Liu [Tue, 7 Mar 2017 00:44:38 +0000 (16:44 -0800)]
Ensure behavior consistency for 0 duration scale
BUG:
35590176
Test: cts in the same topic branch
Change-Id: Ia0a2518a1376d3f82ee6c5a7b27e3cb24ed54cbf
Calin Juravle [Tue, 7 Mar 2017 18:48:13 +0000 (18:48 +0000)]
Merge "PackageManager: Clean up code related to foreign dex use"
Pavel Grafov [Tue, 7 Mar 2017 12:48:00 +0000 (12:48 +0000)]
Retry SECURITY_LOGS_AVAILABLE if DO doesn't request the logs
Test: manually, with TestDPC.
Bug:
34186771
Change-Id: I99ec406b05f7b072c2c729f6336d1a5cf0f7c3d4
Stephen Chen [Mon, 6 Mar 2017 20:20:48 +0000 (12:20 -0800)]
Create a Tron event for opening the network scorer settings page.
Bug:
35854268
Test: n/a
Change-Id: I0a021dcc9016f163f75b8077678f54df1c4f2bf6
TreeHugger Robot [Tue, 7 Mar 2017 18:37:09 +0000 (18:37 +0000)]
Merge "Add ColorSpace information on Bitmap"
Alan Viverette [Tue, 7 Mar 2017 18:29:25 +0000 (18:29 +0000)]
Merge "Add "since" annotations for Support Lib in framework docs build"
Chris Wren [Tue, 7 Mar 2017 18:28:22 +0000 (18:28 +0000)]
Merge "delete obsolete tests"
Scott Main [Tue, 7 Mar 2017 18:25:35 +0000 (18:25 +0000)]
Merge "Mark @ symbols in code snippet as literal so javadoc doesn't choke on them. Which for some reason only starts to happen when we start processing the annotation methods in this CL: https://googleplex-android-review.git.corp.google.com/#/c/
1892771/"
Chris Wren [Tue, 7 Mar 2017 18:22:40 +0000 (13:22 -0500)]
delete obsolete tests
this code was removed in I94732c84564e4cb25d77b63be8beb4aab4c38985
Test: tests are deleted
Change-Id: I1dd466ec8c91de3e39d8019882a92f03aba4f357
TreeHugger Robot [Tue, 7 Mar 2017 18:17:12 +0000 (18:17 +0000)]
Merge "Support non-system Font Providers"
Eino-Ville Talvala [Wed, 1 Mar 2017 01:57:28 +0000 (17:57 -0800)]
Camera: Add createCustomCameraSession to system API.
This has been requested by various Android implementers as
a way to simplify building new device-specific features for
default camera applications.
Test: The added system API tests pass.
Bug:
34853980
Change-Id: I3190f59394af97c0b0c8e520696d096235d596b9
Eino-Ville Talvala [Wed, 1 Mar 2017 01:49:41 +0000 (17:49 -0800)]
CameraDevice: Add hidden createCustomCaptureSession
This exposes a direct route to selecting the operating mode, instead
of only allowing normal and high-speed modes.
Test: Compiles
Bug:
34853980
Change-Id: Ib4f833399834c9bacb9de666560e909109aa5af9
Chris Wren [Tue, 7 Mar 2017 17:54:49 +0000 (17:54 +0000)]
Merge "add clear methods to LogMaker"
Chris Craik [Tue, 7 Mar 2017 17:53:19 +0000 (17:53 +0000)]
Merge "Workaround arc textures drawing outside of bounds"
Chris Wren [Tue, 7 Mar 2017 17:50:11 +0000 (17:50 +0000)]
Merge "remove the last of the legacy log helpers"
TreeHugger Robot [Tue, 7 Mar 2017 17:44:04 +0000 (17:44 +0000)]
Merge "Fixing issue with wrong stack being brought forward."
TreeHugger Robot [Tue, 7 Mar 2017 17:41:45 +0000 (17:41 +0000)]
Merge "Log notification channels and groups."
Jerome Gaillard [Tue, 7 Mar 2017 17:11:11 +0000 (17:11 +0000)]
Merge "Update layoutlib following Change Ia12d448a"
Andreas Gampe [Tue, 7 Mar 2017 17:08:43 +0000 (17:08 +0000)]
Merge "Framework: Ensure image heap string literals for Patterns" am:
d0f092af84 am:
838851364b
am:
5fe3eb7696
Change-Id: Ia0bf25c740eedee436436e573241a59685db2fbd
Andreas Gampe [Tue, 7 Mar 2017 17:03:51 +0000 (17:03 +0000)]
Merge "Framework: Ensure image heap string literals for Patterns" am:
d0f092af84
am:
838851364b
Change-Id: I0b19a98ca157d87c41a3a305b9ae59bb65a9cffe
Etan Cohen [Tue, 7 Mar 2017 17:02:05 +0000 (17:02 +0000)]
Merge "[CM] Allow timeout in request network" am:
8328f27a87 am:
645b48c8af
am:
ac879cbcaf
Change-Id: If42250966d619073d45d608aab454589213b1756
Andreas Gampe [Tue, 7 Mar 2017 16:59:12 +0000 (16:59 +0000)]
Merge "Framework: Ensure image heap string literals for Patterns"
am:
d0f092af84
Change-Id: I69886924b3aca6c050239069c00e166142e2e522
Tobias Thierer [Tue, 7 Mar 2017 16:55:59 +0000 (16:55 +0000)]
Merge "Track: ICU TimeZone: publish TIMEZONE_* constants" am:
aa4877e295 am:
b96d428e40
am:
6779441da0
Change-Id: Ib6b611e88dc342d5ce28e5594db142d54b840c20
Etan Cohen [Tue, 7 Mar 2017 16:55:59 +0000 (16:55 +0000)]
Merge "[CM] Allow timeout in request network" am:
8328f27a87
am:
645b48c8af
Change-Id: Ie3438ba967887ab7776eefaf05a6cf915e866f82
Treehugger Robot [Tue, 7 Mar 2017 16:50:58 +0000 (16:50 +0000)]
Merge "Framework: Ensure image heap string literals for Patterns"
Etan Cohen [Tue, 7 Mar 2017 16:49:53 +0000 (16:49 +0000)]
Merge "[CM] Allow timeout in request network"
am:
8328f27a87
Change-Id: Ic7a3da0a5292be5e13abca9c98c422bc2f50f3a0
Tobias Thierer [Tue, 7 Mar 2017 16:49:38 +0000 (16:49 +0000)]
Merge "Track: ICU TimeZone: publish TIMEZONE_* constants" am:
aa4877e295
am:
b96d428e40
Change-Id: Ie91a466fa5e774cb5cb64361f00bb29643805cf0
Tobias Thierer [Tue, 7 Mar 2017 16:43:16 +0000 (16:43 +0000)]
Merge "Track: ICU TimeZone: publish TIMEZONE_* constants"
am:
aa4877e295
Change-Id: I94edc483a5d9dfeabb19d0eb687c10ba2df6eac9
Etan Cohen [Tue, 7 Mar 2017 16:40:26 +0000 (16:40 +0000)]
Merge "[CM] Allow timeout in request network"
Tobias Thierer [Tue, 7 Mar 2017 16:35:17 +0000 (16:35 +0000)]
Merge "Track: ICU TimeZone: publish TIMEZONE_* constants"
TreeHugger Robot [Tue, 7 Mar 2017 16:02:48 +0000 (16:02 +0000)]
Merge "Framework: Avoid string allocations"
Chris Wren [Mon, 27 Feb 2017 22:42:58 +0000 (17:42 -0500)]
remove the last of the legacy log helpers
All logs should now flow through LogMaker.
Bug:
34705522
Test: mmma -j20 platform_testing/tests/functional/notificationtests && adb install -r -g /data/app/NotificationFunctionalTests/NotificationFunctionalTests.apk && adb shell am instrument -w -e iterations 1 -e class com.android.notification.functional.NotificationInteractionTests com.android.notification.functional/android.support.test.runner.AndroidJUnitRunner && runtest --path platform_testing/libraries/metrics-helper/tests
Change-Id: I94732c84564e4cb25d77b63be8beb4aab4c38985
Chris Wren [Tue, 7 Mar 2017 15:17:20 +0000 (10:17 -0500)]
add clear methods to LogMaker
To support object reuse.
Test: runtest --path frameworks/base/core/tests/coretests/src/android/metrics
Bug:
36020746
Change-Id: I09e5689da70963e9aba3bd8428a55acfcbe4e92a
Julia Reynolds [Fri, 3 Mar 2017 18:32:57 +0000 (13:32 -0500)]
Log notification channels and groups.
Test: manual, runtest systemui-notification
Change-Id: I326a35ae87e7a3dc4b2587271056b7dd5cd11f8d
Clara Bayarri [Tue, 7 Feb 2017 15:33:40 +0000 (15:33 +0000)]
Support non-system Font Providers
To do this, the developer must specify the set of certificate
hashes that represent the authority's app. This allows us to
verify that the authority we find is indeed the one intended
by the developer.
Bug:
35025705
Test: runtest --path frameworks/base/core/tests/coretests/src/android/provider/FontsContractTest.java
runtest --path frameworks/base/core/tests/coretests/src/android/content/res/FontResourcesParserTest.java
CTS attached to topic
Change-Id: I605f9a93bbca8705936ead08efb4a5b4fdcc4882
Erik Kline [Tue, 7 Mar 2017 13:42:11 +0000 (13:42 +0000)]
Merge "request{LinkProperties,NetworkCapabilities} no longer needed" am:
75dfc5bd91 am:
0f901af920
am:
bb54baba04
Change-Id: Id2aa8aeff6d299edb85955c12ab0a04023458597
Erik Kline [Tue, 7 Mar 2017 13:38:07 +0000 (13:38 +0000)]
Merge "request{LinkProperties,NetworkCapabilities} no longer needed" am:
75dfc5bd91
am:
0f901af920
Change-Id: I891abf2a1a4138b9d80b8544ac6d09deda8d3d62
Erik Kline [Tue, 7 Mar 2017 13:33:29 +0000 (13:33 +0000)]
Merge "request{LinkProperties,NetworkCapabilities} no longer needed"
am:
75dfc5bd91
Change-Id: I79b9323be242ed5d2bf83962f78c613a465a20b8
Treehugger Robot [Tue, 7 Mar 2017 13:27:09 +0000 (13:27 +0000)]
Merge "request{LinkProperties,NetworkCapabilities} no longer needed"
Abodunrinwa Toki [Tue, 7 Mar 2017 12:54:47 +0000 (12:54 +0000)]
Merge "Prevent crashes when in insertion mode."
Jerome Gaillard [Tue, 7 Mar 2017 12:34:37 +0000 (12:34 +0000)]
Update layoutlib following Change Ia12d448a
Test: layoutlib tests
Change-Id: I66632bcef3a05d3d89e7fc6a37f099100feed0ad
Rubin Xu [Tue, 7 Mar 2017 10:59:47 +0000 (10:59 +0000)]
Merge "Allow user with a profile owner to have escrow tokens"
Erik Kline [Tue, 7 Mar 2017 06:25:32 +0000 (15:25 +0900)]
request{LinkProperties,NetworkCapabilities} no longer needed
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
- manual USB tethering toggling between WiFi and mobile
Bug:
32163131
Change-Id: I57edf5114b6361f320577c7870e40f8b3cdf74ce
Erik Kline [Tue, 7 Mar 2017 06:40:24 +0000 (06:40 +0000)]
Merge "Handle null NetworkState updates" am:
ae758b2c7f am:
4cf8f7a8cd
am:
b48eb4f71a
Change-Id: Idd5cf1b8de35cca3a7518d6ed76d87044c8846b4
Erik Kline [Tue, 7 Mar 2017 06:36:13 +0000 (06:36 +0000)]
Merge "Handle null NetworkState updates" am:
ae758b2c7f
am:
4cf8f7a8cd
Change-Id: I47cdb040baed8c4c700ff7412a01d79f8edccbd2
Erik Kline [Tue, 7 Mar 2017 06:31:48 +0000 (06:31 +0000)]
Merge "Handle null NetworkState updates"
am:
ae758b2c7f
Change-Id: I9d8d5c176804344a40f6646acf65d2d8a5cd976f
Treehugger Robot [Tue, 7 Mar 2017 06:24:16 +0000 (06:24 +0000)]
Merge "Handle null NetworkState updates"
Erik Kline [Tue, 7 Mar 2017 06:08:40 +0000 (06:08 +0000)]
Merge "Always send all available state when calling onAvailable()." am:
affbb8b6a9 am:
e0a62a4398
am:
3765538bab
Change-Id: Ic82e3cb92841ea99972faad6ae004d77c725831b
Erik Kline [Tue, 7 Mar 2017 06:04:13 +0000 (06:04 +0000)]
Merge "Always send all available state when calling onAvailable()." am:
affbb8b6a9
am:
e0a62a4398
Change-Id: Ie9bd779526e967790cbc51de52a64bbf7cd493a5
Erik Kline [Tue, 7 Mar 2017 06:00:09 +0000 (06:00 +0000)]
Merge "Always send all available state when calling onAvailable()."
am:
affbb8b6a9
Change-Id: I81e70fecf060a4103b51084a60a32c78f6219f6b
Treehugger Robot [Tue, 7 Mar 2017 05:51:40 +0000 (05:51 +0000)]
Merge "Always send all available state when calling onAvailable()."
TreeHugger Robot [Tue, 7 Mar 2017 05:44:49 +0000 (05:44 +0000)]
Merge changes Iefcaf262,I9c397d83
* changes:
Fixed a bug where the expand icon could show but nothing happens
Improved expand accessibility experience
TreeHugger Robot [Tue, 7 Mar 2017 05:24:06 +0000 (05:24 +0000)]
Merge "Waiting for reinflating the notifications until the user switched"
Winson Chung [Tue, 7 Mar 2017 05:02:14 +0000 (05:02 +0000)]
Merge "Small fixes and tweaks to PiP transition."
Winson Chung [Tue, 7 Mar 2017 05:01:20 +0000 (05:01 +0000)]
Merge "Update how PIP size is determined"
Winson Chung [Tue, 7 Mar 2017 05:00:54 +0000 (05:00 +0000)]
Merge "Initial changes to support expanded PiP"
TreeHugger Robot [Tue, 7 Mar 2017 04:40:26 +0000 (04:40 +0000)]
Merge "AOD: Refactor always on configuration"
Erik Kline [Tue, 7 Mar 2017 04:17:39 +0000 (13:17 +0900)]
Handle null NetworkState updates
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
- manual USB tethering to WiFi and mobile switching works
Bug:
32163131
Change-Id: I2d4ef7c135ae6eb50cc31236f2fd20080536ea6a
TreeHugger Robot [Tue, 7 Mar 2017 03:59:43 +0000 (03:59 +0000)]
Merge "Move requestKeyboardShortcuts intent to com.android"
Erik Kline [Wed, 15 Feb 2017 10:59:17 +0000 (19:59 +0900)]
Always send all available state when calling onAvailable().
The state that needs to be transferred includes:
- NetworkCapabilities
- LinkProperties
- whether the network is currently suspended
Additionally:
- Rename notifyNetworkCallback() to notifyNetworkAvailable()
in order to clarify its real function.
- fix previous copy/paste error in unittest
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
- USB tethering with mobile and Wi-Fi upstream toggling
Bug:
32163131
Change-Id: Ib4460bcd5d08863a9feac9e8ab41a238897bb3ea
Romain Guy [Mon, 27 Feb 2017 19:00:04 +0000 (11:00 -0800)]
Add ColorSpace information on Bitmap
This is the first step toward interpreting color spaces at render time.
Bug:
32984164
Test: BitmapColorSpaceTest in CtsGraphicsTestCases
Change-Id: I0164a18f1ed74a745874fe5229168042afe27a04
Tyler Gunn [Tue, 7 Mar 2017 03:05:23 +0000 (03:05 +0000)]
Merge "API review cleanups/changes." am:
9324d6513b am:
dd4bc7c69c
am:
c49b011151
Change-Id: Ib3d76474bef8c911b2ec6a61b916e38af0a3b861
Ruchi Kandoi [Tue, 7 Mar 2017 02:59:38 +0000 (02:59 +0000)]
Merge "nfc: First chunked NDEF record of TNF doesn't contain the type field" am:
7b0d16249c am:
9377a53aa9
am:
61d2a43fa9
Change-Id: Ibb35611f958bf9d1525e0b491860cbc87f1e1273
Tyler Gunn [Tue, 7 Mar 2017 02:57:41 +0000 (02:57 +0000)]
Merge "API review cleanups/changes." am:
9324d6513b
am:
dd4bc7c69c
Change-Id: I40b7b0f025de54e6f92764949ba3d06370d45cd6
Erik Kline [Tue, 7 Mar 2017 02:57:10 +0000 (02:57 +0000)]
Merge "Start of tethering OffloadController" am:
121006f428 am:
4568fa4a82
am:
afc5f223e9
Change-Id: Ia918bd348462aefaf0474dfe9a66ec9fa7ef76b8
Ruchi Kandoi [Tue, 7 Mar 2017 02:53:09 +0000 (02:53 +0000)]
Merge "nfc: First chunked NDEF record of TNF doesn't contain the type field" am:
7b0d16249c
am:
9377a53aa9
Change-Id: Ib8196c580da8fc8602e2a88945050b84545576e8
Erik Kline [Tue, 7 Mar 2017 02:52:09 +0000 (02:52 +0000)]
Merge "Start of tethering OffloadController" am:
121006f428
am:
4568fa4a82
Change-Id: Ib1a7b2cad37e85335d498a12d36f0209b33d5c26
Tyler Gunn [Tue, 7 Mar 2017 02:49:54 +0000 (02:49 +0000)]
Merge "API review cleanups/changes."
am:
9324d6513b
Change-Id: Iaeb4bbb5e551bf4206ea2ab4372d1ba0533c4709
Ruchi Kandoi [Tue, 7 Mar 2017 02:46:54 +0000 (02:46 +0000)]
Merge "nfc: First chunked NDEF record of TNF doesn't contain the type field"
am:
7b0d16249c
Change-Id: I35ccc367fc1182c1cf8c470d8bfcf6dcf27d2825
Erik Kline [Tue, 7 Mar 2017 02:45:51 +0000 (02:45 +0000)]
Merge "Start of tethering OffloadController"
am:
121006f428
Change-Id: I590569818c7d7ac50dcc61bd7058bd7c5cad4e77
Rakesh Iyer [Tue, 7 Mar 2017 02:05:53 +0000 (18:05 -0800)]
Enable escrow tokens on automotive builds.
Cars head units are protected by physical security mechanisms
(doors, locks) so enable escrow tokens on them.
Bug:
33458687
Test: Verified using test trust agent in packages/services/Car
Change-Id: Ic7974a64192cd6d28fec67fe54025efe84cc50fc
TreeHugger Robot [Tue, 7 Mar 2017 02:03:38 +0000 (02:03 +0000)]
Merge "Init of OverlayManagerService on a parallel thread"