OSDN Git Service
TreeHugger Robot [Thu, 9 Mar 2017 03:00:39 +0000 (03:00 +0000)]
Merge "Add version of @UiThreadTest that works at class level"
Donghyun Cho [Thu, 9 Mar 2017 02:06:49 +0000 (02:06 +0000)]
Merge "CEC: Add a method to control standby mode of the device"
TreeHugger Robot [Thu, 9 Mar 2017 02:06:06 +0000 (02:06 +0000)]
Merge "Make Bitmap.get/setPixel[s] color space aware"
TreeHugger Robot [Thu, 9 Mar 2017 01:52:59 +0000 (01:52 +0000)]
Merge "Audio focus: framework enforces ducking"
TreeHugger Robot [Thu, 9 Mar 2017 01:37:19 +0000 (01:37 +0000)]
Merge "Fix API checking for some"
TreeHugger Robot [Thu, 9 Mar 2017 01:21:55 +0000 (01:21 +0000)]
Merge "Updated javadoc for ACTION_MANAGE_EXTERNAL_SOURCES"
Chris Tate [Thu, 9 Mar 2017 01:16:33 +0000 (01:16 +0000)]
Merge "Shell can now fake battery presence"
Mathias Agopian [Thu, 9 Mar 2017 01:15:45 +0000 (01:15 +0000)]
Merge "fallout from getting rid of IGraphicBufferAlloc"
TreeHugger Robot [Thu, 9 Mar 2017 01:13:11 +0000 (01:13 +0000)]
Merge "Provided an AutofillCallback API."
Romain Guy [Wed, 8 Mar 2017 23:58:06 +0000 (15:58 -0800)]
Make Bitmap.get/setPixel[s] color space aware
Bug:
32984164
Test: cts-tradefed run singleCommand cts-dev --module CtsGraphicsTestCases --test android.graphics.cts.BitmapColorSpaceTest
Change-Id: Iee8c4abb264f0d2a44bae59788fbf4dcb2d0fdf7
Andy Hung [Thu, 9 Mar 2017 00:31:18 +0000 (00:31 +0000)]
Merge "VolumeShaper: Update Builder methods and Object overrides"
TreeHugger Robot [Thu, 9 Mar 2017 00:29:55 +0000 (00:29 +0000)]
Merge "Fix bug in error checking in GnssLocationProvider"
TreeHugger Robot [Thu, 9 Mar 2017 00:09:58 +0000 (00:09 +0000)]
Merge "Throw at getPackageSizeInfoAsUser() callers."
Eino-Ville Talvala [Thu, 9 Mar 2017 00:02:48 +0000 (16:02 -0800)]
Fix API checking for some
Using AIDL constants in the definition of public API static ints seems
to confuse build tools sometimes. Switch to just duplicating the
constants until that's worked out.
Test: Builds, at least for me!
Change-Id: I0fbe95bc0492eb8b39687f25a6c7e073fbb65dc4
TreeHugger Robot [Wed, 8 Mar 2017 23:21:50 +0000 (23:21 +0000)]
Merge "Optimize ViewStructure for autofill by removing irrelevant nodes."
Dmitry Dementyev [Wed, 8 Mar 2017 23:20:57 +0000 (23:20 +0000)]
Merge "Use LinedHashMap in AccountManagerService to return accounts in the order of database addition"
Mathias Agopian [Tue, 28 Feb 2017 03:34:45 +0000 (19:34 -0800)]
fallout from getting rid of IGraphicBufferAlloc
Test: compiled & run
Bug: cleanup
Change-Id: I1590105d3abef985c2ae7c1a03cdf5fd2ec4bef9
TreeHugger Robot [Wed, 8 Mar 2017 22:51:47 +0000 (22:51 +0000)]
Merge "Move lagging users over to new storage API."
Jeff Sharkey [Wed, 8 Mar 2017 04:03:18 +0000 (21:03 -0700)]
Throw at getPackageSizeInfoAsUser() callers.
But only when targeting O; if they're old apps then log and pass
a soft failure message to their callback.
Test: builds, boots
Bug:
35749102
Change-Id: I6c6b5a37c23669e7b1ed3c30207bca610821eb1f
Scott Main [Wed, 8 Mar 2017 21:59:09 +0000 (21:59 +0000)]
Merge "update uiautomator doclava build to use new location for templates as per: https://googleplex-android-review.git.corp.google.com/#/c/
1524290/"
Selim Cinek [Wed, 8 Mar 2017 21:52:55 +0000 (21:52 +0000)]
Merge "Fixed a bug where the scrim was distracting when pulling on HUN"
Tenghui Zhu [Wed, 8 Mar 2017 21:42:43 +0000 (21:42 +0000)]
Merge "Disable versioning for pathInterpolator when no-version-vectors is on."
Felipe Leme [Thu, 2 Mar 2017 20:56:18 +0000 (12:56 -0800)]
Optimize ViewStructure for autofill by removing irrelevant nodes.
Test: CtsAutoFillServiceTestCases (with new tests) pass
Fixes:
35840787
Change-Id: Iaa2c1907c8383b4a820fd7204e67fa2d276ad2b8
Jeff Sharkey [Wed, 8 Mar 2017 21:19:37 +0000 (21:19 +0000)]
Merge "Revert "Throw at getPackageSizeInfoAsUser() callers.""
Wally Yau [Wed, 8 Mar 2017 21:11:57 +0000 (21:11 +0000)]
Merge "AC3/EAC3 MaxInputChannelCount support"
TreeHugger Robot [Wed, 8 Mar 2017 21:08:52 +0000 (21:08 +0000)]
Merge "Replace AutoFillType by view constants."
TreeHugger Robot [Wed, 8 Mar 2017 21:06:17 +0000 (21:06 +0000)]
Merge "Surrounding some field names with quotes to avoid breaking CSV assumptions."
Jeff Sharkey [Wed, 8 Mar 2017 20:57:15 +0000 (13:57 -0700)]
Move lagging users over to new storage API.
Over the last month we've been moving everyone over to the new
StorageStatsManager public APIs, but we missed these users.
The ApplicationsState changes are straightforward, but we had to
completely rewrite StorageMeasurement to use the new fast-path
quota APIs.
Test: builds, boots, UI using StorageMeasurement works.
Bug:
36056120
Change-Id: If02177c95bf8c96ae4eceac4d631a168f99bef84
Keun-young Park [Wed, 8 Mar 2017 20:56:13 +0000 (20:56 +0000)]
Merge "log fs_stat from fs_mgr and mount_all time"
Jesse Evans [Wed, 8 Mar 2017 20:52:46 +0000 (20:52 +0000)]
Merge "Adds an explicit id for visibleToInstantApps attr"
TreeHugger Robot [Wed, 8 Mar 2017 20:40:58 +0000 (20:40 +0000)]
Merge "Do not disable Open Network Notifications setting on profile change."
TreeHugger Robot [Wed, 8 Mar 2017 20:38:03 +0000 (20:38 +0000)]
Merge "Updating moveTaskToBack to handle PiP activities"
Brad Ebinger [Wed, 8 Mar 2017 20:11:04 +0000 (20:11 +0000)]
Merge "Return generic Binder on onBind" am:
c6613f7206 am:
2a71bd5150
am:
2fca3afd4b
Change-Id: Ic668d9bb43f58f28c096083f89c6bec30cf9640a
Brad Ebinger [Wed, 8 Mar 2017 20:06:26 +0000 (20:06 +0000)]
Merge "Return generic Binder on onBind" am:
c6613f7206
am:
2a71bd5150
Change-Id: Ie447b8094ca9c483aac3886c795240301b5f2ace
Lei Yu [Wed, 8 Mar 2017 20:02:40 +0000 (20:02 +0000)]
Merge "Add BatterySaverPolicy for power save mode"
Brad Ebinger [Wed, 8 Mar 2017 20:02:03 +0000 (20:02 +0000)]
Merge "Return generic Binder on onBind"
am:
c6613f7206
Change-Id: Ibc8cce3c63b93820f6bdd842e6a751233240874d
TreeHugger Robot [Wed, 8 Mar 2017 19:55:38 +0000 (19:55 +0000)]
Merge "Add metric for openProxyFileDescriptor."
Brad Ebinger [Wed, 8 Mar 2017 19:53:25 +0000 (19:53 +0000)]
Merge "Return generic Binder on onBind"
TreeHugger Robot [Wed, 8 Mar 2017 19:50:14 +0000 (19:50 +0000)]
Merge "TextClassifier: Introduce LocaleList in the API."
TreeHugger Robot [Wed, 8 Mar 2017 19:49:37 +0000 (19:49 +0000)]
Merge "Add new constants to track successful contact queries Bug:
35803126,
35873712 Test: No need to add any tests for this"
Jakub Pawlowski [Wed, 8 Mar 2017 19:45:37 +0000 (19:45 +0000)]
Merge "Bluetooth 5 Advertising API" am:
1bb08c25b8 am:
fc3c9d0e9e
am:
c162879c6a
Change-Id: I61382d466f28311b8ba5dd4ab120747eb0708501
Jakub Pawlowski [Wed, 8 Mar 2017 19:44:04 +0000 (19:44 +0000)]
Merge "Bluetooth 5 PHY selection API" am:
104eeedb42 am:
4f6034160c
am:
3730cd9608 -s ours
Change-Id: I5d0dfea7068f123e544686d0522d06a3a1bbf095
Jakub Pawlowski [Wed, 8 Mar 2017 19:35:27 +0000 (19:35 +0000)]
Merge "Bluetooth 5 periodc scan API (1/2)" am:
f1d76a71c8 am:
8acd7391bd
am:
600a67a8c8 -s ours
Change-Id: Ibc1fc04aa569bb641a006b490ebf8450480b00ed
Jakub Pawlowski [Wed, 8 Mar 2017 19:28:54 +0000 (19:28 +0000)]
Merge "Bluetooth 5 Advertising API" am:
1bb08c25b8
am:
fc3c9d0e9e
Change-Id: Ib8e53386754ccfec27314bc1d29aaabde0cb7976
Keun-young Park [Thu, 2 Mar 2017 23:26:49 +0000 (15:26 -0800)]
log fs_stat from fs_mgr and mount_all time
- fs_mgr reports fs_stat int value during bootup when mounting
an ext4 partition.
- This includes information like:
if previous shutdown was clean
if e2fsck has fixed any fs issue
if any mounting or quota related operations has failed.
- Each information is set as flag. Flag definitions are avaiable from
FsStatFlags in system/core/fs_mgr/fs_mgr.cpp
- log ro.boottime.init.mount_all.[early|default|late] which represent
time duration for each mount stage. Depending on device's config, some of
these stages may not exist. So do not log if value is 0, which means not existing.
bug:
32246772
bug:
35949600
bug:
35329915
Test: manual, check log after boot-up.
Change-Id: I4ceca88776119d88d5352d6793be122e82688279
Jakub Pawlowski [Wed, 8 Mar 2017 19:27:38 +0000 (19:27 +0000)]
Merge "Bluetooth 5 PHY selection API" am:
104eeedb42
am:
4f6034160c
Change-Id: I3183ead1802d166aae903c180be46f19ea8291ee
Jakub Pawlowski [Wed, 8 Mar 2017 19:27:32 +0000 (19:27 +0000)]
Merge "Bluetooth 5 enhanced scanning API" am:
bed6fb3f5a am:
71760b71fd
am:
f64a341eb7
Change-Id: I309e654e65001d9b97c457a272601761e54f9a73
Jakub Pawlowski [Wed, 8 Mar 2017 19:22:59 +0000 (19:22 +0000)]
Merge "Bluetooth 5 periodc scan API (1/2)" am:
f1d76a71c8
am:
8acd7391bd
Change-Id: If28e751c19883914f3a44eb9fdec03e08a6a1901
Jakub Pawlowski [Wed, 8 Mar 2017 19:22:05 +0000 (19:22 +0000)]
Merge "Bluetooth 5 feature check API (1/2)" am:
a06a0dfdb7 am:
e9bd9be3cb
am:
0798f31c34
Change-Id: I871c18d414ce5a7517eba911c7e4ee441377f14c
Scott Main [Wed, 8 Mar 2017 19:18:50 +0000 (11:18 -0800)]
update uiautomator doclava build to use new location for templates
as per:
https://googleplex-android-review.git.corp.google.com/#/c/
1524290/
Change-Id: Ib8588f01005a691474622e6ca81f63234f796f82
Jakub Pawlowski [Wed, 8 Mar 2017 19:21:03 +0000 (19:21 +0000)]
Merge "Bluetooth 5 Advertising API"
am:
1bb08c25b8
Change-Id: Ifd95aacf025929d3c9f5a1762f31ed20c26fabfd
Jakub Pawlowski [Wed, 8 Mar 2017 19:21:00 +0000 (19:21 +0000)]
Merge "Bluetooth 5 enhanced scanning API" am:
bed6fb3f5a
am:
71760b71fd
Change-Id: I6a5de71a10fb1e326e57f3a9bd665229535a6571
Kweku Adams [Wed, 8 Mar 2017 16:12:15 +0000 (08:12 -0800)]
Surrounding some field names with quotes to avoid breaking CSV assumptions.
Some names can include commas, and if they're not surrounded by quotes,
then CSV parsing breaks, as was the case in
https://github.com/google/battery-historian/issues/94#issuecomment-
282790498
and several other circumstances.
Test: flashed local device and ran batterystats output through Historian
Change-Id: I070c5d873d9f79996a581bf0a5f664136c0af454
Jakub Pawlowski [Wed, 8 Mar 2017 19:18:50 +0000 (19:18 +0000)]
Merge "Bluetooth 5 PHY selection API"
am:
104eeedb42
Change-Id: I0ee2daaf0771b405c8a14598a70459879d31c953
Jakub Pawlowski [Wed, 8 Mar 2017 19:17:08 +0000 (19:17 +0000)]
Merge "Bluetooth 5 feature check API (1/2)" am:
a06a0dfdb7
am:
e9bd9be3cb
Change-Id: I462d459638f2b41f8806b877a6b307e21e6e30d3
Jakub Pawlowski [Wed, 8 Mar 2017 19:14:22 +0000 (19:14 +0000)]
Merge "Bluetooth 5 periodc scan API (1/2)"
am:
f1d76a71c8
Change-Id: I7b68746e3dc02a12d13380a90bcf26cebfd31f16
Jakub Pawlowski [Wed, 8 Mar 2017 19:12:08 +0000 (19:12 +0000)]
Merge "Bluetooth 5 enhanced scanning API"
am:
bed6fb3f5a
Change-Id: I27d61ec7446c36143dcd5a94158451e1be9a5411
Jakub Pawlowski [Wed, 8 Mar 2017 19:09:43 +0000 (19:09 +0000)]
Merge "Bluetooth 5 feature check API (1/2)"
am:
a06a0dfdb7
Change-Id: I59cf0e8f496e6a1201a3a6ec832c33cd1c8972df
Jakub Pawlowski [Wed, 8 Mar 2017 19:05:12 +0000 (19:05 +0000)]
Merge "Bluetooth 5 Advertising API"
Winson Chung [Wed, 8 Mar 2017 00:54:31 +0000 (16:54 -0800)]
Updating moveTaskToBack to handle PiP activities
- When a PiP activity calls moveTaskToBack(), we should fall through to
the same behaviour as dismissing the PiP if there are no other tasks
to show.
Bug:
36034065
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testMovePipToBackWithNoFullscreenStack
Test: #testMovePipToBackWithVisibleFullscreenStack
Test: #testMovePipToBackWithHiddenFullscreenStack
Change-Id: I83c3d27dabc031546f9f1cf20b808bb8f13d4646
Signed-off-by: Winson Chung <winsonc@google.com>
Jakub Pawlowski [Tue, 10 Jan 2017 14:15:54 +0000 (06:15 -0800)]
Bluetooth 5 Advertising API
Test: manual
Bug:
30622771
Change-Id: Id6856e6110872ec50ff1af54ddc75c0104a6459c
(cherry picked from commit
5324a14cf490656269ef862d7f8f6b139a21c0e6)
Jakub Pawlowski [Wed, 8 Mar 2017 19:04:30 +0000 (19:04 +0000)]
Merge "Bluetooth 5 PHY selection API"
Tony Mantler [Wed, 8 Mar 2017 19:04:22 +0000 (19:04 +0000)]
Revert "Throw at getPackageSizeInfoAsUser() callers."
This reverts commit
597c93454699eaed99d6b417080417d75777e72d.
Change-Id: I7d966ef973050ef791403062774fd7f576a65388
Selim Cinek [Wed, 8 Mar 2017 19:04:16 +0000 (19:04 +0000)]
Merge changes I6823a613,I7763b473
* changes:
Fixed a bug where the low-priority header wasn't cleared
Fixes an issue where the notification header could be invisible
Jakub Pawlowski [Thu, 2 Feb 2017 16:07:12 +0000 (08:07 -0800)]
Bluetooth 5 PHY selection API
Bug:
30622771
Test: manual
Change-Id: I50262a56a70466439f9700549c3c0e7bd49e2e8d
(cherry picked from commit
db5a87d50db9d4b3d642603f6c329b83ee5851f6)
Jakub Pawlowski [Wed, 8 Mar 2017 19:03:47 +0000 (19:03 +0000)]
Merge "Bluetooth 5 periodc scan API (1/2)"
Jakub Pawlowski [Mon, 16 Jan 2017 15:21:01 +0000 (07:21 -0800)]
Bluetooth 5 periodc scan API (1/2)
Bug:
30622771
Test: manual
Change-Id: I61853bc71f6013e9406d1d151bb51ea4484bb92c
(cherry picked from commit
a48e03745becc96181c676dc3d194d0572f11c10)
Jakub Pawlowski [Wed, 8 Mar 2017 19:02:57 +0000 (19:02 +0000)]
Merge "Bluetooth 5 enhanced scanning API"
Jakub Pawlowski [Tue, 17 Jan 2017 15:50:46 +0000 (07:50 -0800)]
Bluetooth 5 enhanced scanning API
Bug:
30622771
Test: manual
Change-Id: I2c8065fbcedf48777ce18c7d8fe621e568b3fd75
(cherry picked from commit
9de522c6e48497028d36a1f8ad8f8adf4b7b1ae6)
Jakub Pawlowski [Wed, 8 Mar 2017 19:02:11 +0000 (19:02 +0000)]
Merge "Bluetooth 5 feature check API (1/2)"
Hridya Valsaraju [Wed, 8 Mar 2017 18:57:06 +0000 (10:57 -0800)]
Fix bug in error checking in GnssLocationProvider
Needed to check if gnssNiIface was a nullptr
before calling setCallback on it.
Bug:
36052760
Test: make
Change-Id: I4d725bd30310353fb7d248f9bf247ac55f94c765
Andy Hung [Mon, 6 Mar 2017 19:39:10 +0000 (11:39 -0800)]
VolumeShaper: Update Builder methods and Object overrides
Builder methods now throw IllegalArgumentExceptions on invalid
conditions.
Object hashCode, toString, equals updated for element-wise structural
equivalence.
Test: CTS VolumeShaperTest
Bug:
31015569
Change-Id: I02860a51da58d8207145a9b8a5d2cb13806774b4
Santos Cordon [Wed, 8 Mar 2017 18:40:23 +0000 (18:40 +0000)]
Merge "Map STATE_VR to STATE_ON for Battery Stats."
Jakub Pawlowski [Wed, 8 Feb 2017 02:05:39 +0000 (18:05 -0800)]
Bluetooth 5 feature check API (1/2)
Bug:
30622771
Test: manual
Change-Id: I90e2efe989745c07c2f2fb8f4ea5bc3b718382f6
(cherry picked from commit
79d66495c32996a5b532328571bf6ceecca70ca5)
TreeHugger Robot [Wed, 8 Mar 2017 18:16:39 +0000 (18:16 +0000)]
Merge "Grumble, nobody likes kibibytes."
Dmitry Dementyev [Thu, 2 Mar 2017 21:53:31 +0000 (13:53 -0800)]
Use LinedHashMap in AccountManagerService to return accounts in the
order of database addition
Test: cts
Bug:
35930761
Change-Id: I7600d858a7fdda45689dc0b933b0246dbded8334
mariagpuyol [Wed, 1 Mar 2017 20:09:56 +0000 (12:09 -0800)]
Add new constants to track successful contact queries
Bug:
35803126,
35873712
Test: No need to add any tests for this
Change-Id: Ib902c28ebabb1bf17b4b2b80f70e08ab2571e75f
TreeHugger Robot [Wed, 8 Mar 2017 17:52:37 +0000 (17:52 +0000)]
Merge "Store alphaChar as lower case in MenuItem's implementations"
Joachim Sauer [Wed, 8 Mar 2017 17:50:44 +0000 (17:50 +0000)]
Merge "Renaming Czech Republic to Czechia." am:
33bade08de am:
260b81aaf2
am:
d06f548226
Change-Id: Ie7c7c3415738623c184e2e9e96d85cbe05cbfee7
ZhiWei Chen [Thu, 23 Feb 2017 12:02:18 +0000 (20:02 +0800)]
AC3/EAC3 MaxInputChannelCount support
bug:
33972143
Change-Id: I63b6d5f8dcb66734ce0bd640febd91fb40bda333
Joachim Sauer [Wed, 8 Mar 2017 17:45:02 +0000 (17:45 +0000)]
Merge "Renaming Czech Republic to Czechia." am:
33bade08de
am:
260b81aaf2
Change-Id: Idbbf0592f4066e11269987b66fbfe575e2add0a2
Jerome Gaillard [Wed, 8 Mar 2017 17:44:35 +0000 (17:44 +0000)]
Merge "Ignore native color spaces following Change I0164a18f"
Joachim Sauer [Wed, 8 Mar 2017 17:40:13 +0000 (17:40 +0000)]
Merge "Renaming Czech Republic to Czechia."
am:
33bade08de
Change-Id: Ie76ebb1bd53eb4993f0d01c7d3b5ba7dae9c6504
Joachim Sauer [Wed, 8 Mar 2017 17:31:26 +0000 (17:31 +0000)]
Merge "Renaming Czech Republic to Czechia."
Philip P. Moltmann [Wed, 8 Mar 2017 17:23:12 +0000 (17:23 +0000)]
Merge "Issue a warning if SharedPreferences are corrupted"
jackqdyulei [Thu, 9 Feb 2017 23:29:16 +0000 (15:29 -0800)]
Add BatterySaverPolicy for power save mode
The BatterySaverPolicy is designed to consolidate all battery saver
knobs into a central location. Usually it is consistent to
mLowPowerModeEnabled unless it gets different data for specific
service. By adding these knobs, we can effectively tune the battery
saver.
This cl sets up the framework for BatterySaverPolicy and updates
following service to get battery saver data from BatterySaverPolicy
1. GnssLocationProvider
2. VibratorService
3. WindowManagerService
4. BackupManagerService
5. SoundTriggerService
6. NetworkPolicyManagerService
Screen brightness will come in a following cl.
Bug:
34693888
Test: FrameworksServicesTests
Change-Id: I6b040e93391614b44d136a485faa4a332c396e51
Jesse Evans [Wed, 8 Mar 2017 00:28:51 +0000 (16:28 -0800)]
Adds an explicit id for visibleToInstantApps attr
Adds an explicit id for visibleToInstantApps attr.
This fix is to enable Instant Apps to use the gcore that will ship
with Android O. Gcore is not building against the O SDK, so to
enable them to use the visibleToInstantApps attribute, we are going
to provide them with a modified public.xml to use in the api 25
SDK.
Test: Ensured coretests / FontResourcesParserTest continues to pass.
Bug:
36036242
Change-Id: I5a9b878cdbffe9323b299e8dbe82c599e33a6834
Philip P. Moltmann [Wed, 8 Mar 2017 17:13:23 +0000 (17:13 +0000)]
Merge "Log histogram of fsync times of sharedPreferences"
Etan Cohen [Wed, 8 Mar 2017 15:15:48 +0000 (15:15 +0000)]
Merge "[AWARE] Add data-path security configuration (Passphrase)" am:
769fa0c881 am:
0501c50040
am:
08e9d52817
Change-Id: I9e2cae82179316a6768fa43a7f313c32470fd40a
Etan Cohen [Wed, 8 Mar 2017 15:10:18 +0000 (15:10 +0000)]
Merge "[AWARE] Add data-path security configuration (Passphrase)" am:
769fa0c881
am:
0501c50040
Change-Id: Id7d33f9fc01e30e62dd765ceedd929506a9cd5b5
Paul Duffin [Wed, 8 Mar 2017 15:09:13 +0000 (15:09 +0000)]
Merge "Replace usages of littlemock with mockito" am:
0a11c83016 am:
b29311bbba
am:
48a78f4852
Change-Id: I826f98625ce3fbc57f71d72bc0bfdabd3ff92b06
Etan Cohen [Wed, 8 Mar 2017 15:05:18 +0000 (15:05 +0000)]
Merge "[AWARE] Add data-path security configuration (Passphrase)"
am:
769fa0c881
Change-Id: If38fa15ce7c6606f081b86dad1ecbe0cac453ed5
Paul Duffin [Wed, 8 Mar 2017 15:04:06 +0000 (15:04 +0000)]
Merge "Replace usages of littlemock with mockito" am:
0a11c83016
am:
b29311bbba
Change-Id: I94c0ab304eb1ac8b68b897e6b74f737df2c2bff8
Paul Duffin [Wed, 8 Mar 2017 14:59:26 +0000 (14:59 +0000)]
Merge "Replace usages of littlemock with mockito"
am:
0a11c83016
Change-Id: I1456ae3d07d396080a817de01796eefc71230981
Etan Cohen [Wed, 8 Mar 2017 14:55:04 +0000 (14:55 +0000)]
Merge "[AWARE] Add data-path security configuration (Passphrase)"
Paul Duffin [Wed, 8 Mar 2017 14:36:16 +0000 (14:36 +0000)]
Merge "Replace usages of littlemock with mockito"
Jerome Gaillard [Wed, 8 Mar 2017 14:02:22 +0000 (14:02 +0000)]
Ignore native color spaces following Change I0164a18f
Test: layoutlib tests
Change-Id: I2fc2f13621524142d00fb86c45e75ecdb250479a
Jason Monk [Mon, 6 Mar 2017 16:19:20 +0000 (11:19 -0500)]
Add version of @UiThreadTest that works at class level
Saves a bunch of lines of tagging every test with @UiThreadTest
Test: runtest systemui
Change-Id: Id565dbe6bf1ae3dd7b3b23c507d1b3c386a36974
Gustav Sennton [Wed, 8 Mar 2017 13:47:33 +0000 (13:47 +0000)]
Merge "Update WebView.getCurrentWebViewPackage documentation."
Tobias Thierer [Wed, 8 Mar 2017 12:18:25 +0000 (12:18 +0000)]
Merge "Don't allow MapCollections to iterate past the end."