OSDN Git Service
Narayan Kamath [Thu, 21 Dec 2017 09:43:38 +0000 (09:43 +0000)]
WorkSource: Fix NPE on set(int) / set(int, String).
mChains might be null.
Bug:
62390666
Test: WorkSourceTest
Test: run cts-dev -m CtsOsTestCases -t android.os.cts.WorkSourceTest
Change-Id: I1dbc2abc576c280ad41ad6214745b0d34c5727a0
Robert Berry [Thu, 21 Dec 2017 08:42:53 +0000 (08:42 +0000)]
Merge "Add tests for KeySyncUtils now that SecureBox is available"
Zhi An Ng [Thu, 21 Dec 2017 06:20:22 +0000 (06:20 +0000)]
Merge "Fix over-granting permission on low ram"
TreeHugger Robot [Thu, 21 Dec 2017 06:16:24 +0000 (06:16 +0000)]
Merge "Remove the hacky HashableDimensionKey."
TreeHugger Robot [Thu, 21 Dec 2017 06:15:04 +0000 (06:15 +0000)]
Merge "Add log source filtering in statsd to filter out spams."
TreeHugger Robot [Thu, 21 Dec 2017 05:34:56 +0000 (05:34 +0000)]
Merge "Notify RecoverableKeyStoreLoader about successful unlock."
Hugo Benichi [Thu, 21 Dec 2017 05:01:49 +0000 (05:01 +0000)]
Merge "MacAddress: address api review comments"
TreeHugger Robot [Thu, 21 Dec 2017 04:55:15 +0000 (04:55 +0000)]
Merge changes Ie1eb63dc,Ib7cc4d52
* changes:
Renames setCallbackOnComplete method in ContextHubTransaction
Rename ContextHubTransaction.Result IntDef
TreeHugger Robot [Thu, 21 Dec 2017 04:48:35 +0000 (04:48 +0000)]
Merge "New Autofill API:AutofillManager.getAutofillServiceComponentName()"
TreeHugger Robot [Thu, 21 Dec 2017 04:10:23 +0000 (04:10 +0000)]
Merge "Remove scale effect from screen off animation"
Sudheer Shanka [Thu, 21 Dec 2017 03:51:40 +0000 (03:51 +0000)]
Merge "Update BatteryStatsImpl to track per-procstate cpu times."
Dmitry Dementyev [Tue, 19 Dec 2017 22:47:26 +0000 (14:47 -0800)]
Notify RecoverableKeyStoreLoader about successful unlock.
Use simple pattern matching to distinguish between between pin and
passwords.
Test: none
Bug:
66499222
Change-Id: I5cf7c37b22b2c90a9d6a61bd40de45d69cb1364d
Yao Chen [Wed, 20 Dec 2017 00:46:36 +0000 (16:46 -0800)]
Remove the hacky HashableDimensionKey.
+ Add a real HashableDimensionKey as a wrapper of the dimension.
So we can get rid of the maps that we kept.
Pay down technical debt and reduce memory usage.
Test: statsd_test & manual
Change-Id: I233280cf1e2ce93da6a8cd4e8514abb066f4016d
Yao Chen [Mon, 18 Dec 2017 20:53:50 +0000 (12:53 -0800)]
Add log source filtering in statsd to filter out spams.
+ Add log source whitelist in StatsdConfig
+ Some changes in UidMap API. Listener needs to be wp instead of sp.
+ Update dogfood app config to have log source
+ Increase the stats service thread pool size to 10 (9+1).
TODO: add unit tests(b/
70805664). This unit test takes some time to write.
Test: statsd_test & manual
Change-Id: I129b1cc13db5114db7417580962bd7cc4438519d
TreeHugger Robot [Thu, 21 Dec 2017 02:01:15 +0000 (02:01 +0000)]
Merge "Add more methods to RecoverableKeyStoreLoader."
TreeHugger Robot [Thu, 21 Dec 2017 02:00:56 +0000 (02:00 +0000)]
Merge "Support new Autofill session after service returns a null FillResponse."
TreeHugger Robot [Thu, 21 Dec 2017 01:48:30 +0000 (01:48 +0000)]
Merge "Settings: Add LOCAL_MAC_ADDRESS permission"
TreeHugger Robot [Thu, 21 Dec 2017 01:37:56 +0000 (01:37 +0000)]
Merge "Limit collapsed SB notification icons to 4"
TreeHugger Robot [Thu, 21 Dec 2017 01:37:05 +0000 (01:37 +0000)]
Merge "Add in-memory storage for listeners used by RecoverableKeyStoreLoader"
TreeHugger Robot [Thu, 21 Dec 2017 01:27:18 +0000 (01:27 +0000)]
Merge "Implement startRecoverySession"
TreeHugger Robot [Thu, 21 Dec 2017 01:20:28 +0000 (01:20 +0000)]
Merge changes from topic "work_mode_api1"
* changes:
Add access control to trySetWorkModeEnabled and make it public
Merge setQuietModeEnabled and trySetQuietModeDisabled into one API
Hugo Benichi [Fri, 15 Dec 2017 01:07:35 +0000 (10:07 +0900)]
MacAddress: address api review comments
1) toSafeString() is renamed to toOuiString()
2) toOuiString() returns a String that only contains the first 3 bytes
of the mac address.
Bug:
70336442
Test: runtest frameworks-net
Change-Id: I798d8fec32dbff5687a682028e5d90eb941f81c1
Merged-In: I798d8fec32dbff5687a682028e5d90eb941f81c1
(cherry pick from commit
a0ecf38d302ef67aa9f767b1072369f8c417952d)
TreeHugger Robot [Wed, 20 Dec 2017 23:15:51 +0000 (23:15 +0000)]
Merge "Allow hover tooltips for disabled views."
Arthur Ishiguro [Wed, 20 Dec 2017 20:09:21 +0000 (12:09 -0800)]
Renames setCallbackOnComplete method in ContextHubTransaction
setOnCompleteCallback seems easier to understand.
Bug:
67734082
Test: None
Change-Id: Ie1eb63dc5b90a35e847bd5d2a350f97ca277342d
Phil Weaver [Wed, 20 Dec 2017 22:33:55 +0000 (22:33 +0000)]
Merge "Always show window divider to accessibility"
Maggie Wang [Wed, 20 Dec 2017 22:31:43 +0000 (22:31 +0000)]
Merge "Sort "Recent Location Requests" by recency."
TreeHugger Robot [Wed, 20 Dec 2017 22:24:22 +0000 (22:24 +0000)]
Merge "Fix broken MenuLayoutPortraitTest"
Roshan Pius [Thu, 14 Dec 2017 18:34:00 +0000 (10:34 -0800)]
Settings: Add LOCAL_MAC_ADDRESS permission
This permission is needed for displaying the WIFI MAC address.
Bug:
70638295
Test: Wifi network details page shows the wifi MAC address.
Change-Id: Iaa595d520abf36ba55cfa9e888b169baae6ea1fb
Eric Schwarzenbach [Wed, 20 Dec 2017 22:02:28 +0000 (22:02 +0000)]
Merge "Add strings for Wifi Wake onboarding notification."
Felipe Leme [Thu, 14 Dec 2017 21:27:44 +0000 (13:27 -0800)]
New Autofill API:AutofillManager.getAutofillServiceComponentName()
Also minor fixes on isFieldClassificationEnabled() to make sure it's ignored
when not called by the service app and its calls are properly synchronized.
Test: atest CtsAutoFillServiceTestCases:LoginActivityTest#testGetAutofillServiceComponentName
Fixes:
70678279
Change-Id: I58ccb313d22c30af907f3da62f727f067240fa66
Maggie [Tue, 12 Dec 2017 02:02:36 +0000 (18:02 -0800)]
Sort "Recent Location Requests" by recency.
The list of apps with recent location requests is currently displayed in
alphabetical order on device (Settings -> Security & Location ->
Location). Sort this list by recency: (1) apps that are currently
requesting location are displayed on the top. (2) For apps that are not currently
requesting location, the ones with most recent location request finish
time come first.
Bug:
70350519
Test: Robolectric
Test: manual
Change-Id: I5c757defcd7645d254c9c47e3c83f7e323247a71
Ng Zhi An [Tue, 19 Dec 2017 19:19:30 +0000 (11:19 -0800)]
Fix over-granting permission on low ram
Bug:
69258381
Bug:
69587247
Test: cts-tradefed run gts-dev -m GtsPermissionTestCases
Change-Id: Id51723dfaa711c18962a9ba1caa9cfc35e6cc53d
Robert Berry [Wed, 20 Dec 2017 15:59:37 +0000 (15:59 +0000)]
Implement startRecoverySession
Test: adb shell am instrument -w -e package com.android.server.locksettings.recoverablekeystore com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I25e99f6014ef5e831420367040de7e1a80f134f0
Mady Mellor [Wed, 20 Dec 2017 21:16:17 +0000 (21:16 +0000)]
Merge "Add subtype for priority"
TreeHugger Robot [Wed, 20 Dec 2017 21:09:27 +0000 (21:09 +0000)]
Merge "Improve nine patch scaling"
Robert Berry [Wed, 20 Dec 2017 21:06:55 +0000 (21:06 +0000)]
Merge "Use RecoverableKeyStoreDb in RecoverableKeyGenerator"
TreeHugger Robot [Wed, 20 Dec 2017 21:04:38 +0000 (21:04 +0000)]
Merge "Unhide HINT_HIDDEN from slices api and rename to HINT_SHORTCUT"
Robert Berry [Wed, 20 Dec 2017 21:01:33 +0000 (21:01 +0000)]
Merge "Back PlatformKeyManager with database"
TreeHugger Robot [Wed, 20 Dec 2017 20:40:57 +0000 (20:40 +0000)]
Merge "Communicate relevantEvents=0 for packages excluded from whitelist"
Lucas Dupin [Wed, 20 Dec 2017 20:10:28 +0000 (12:10 -0800)]
Remove scale effect from screen off animation
Not resizing anymore per UX guidelines.
Test: visual, press power button.
Change-Id: Ic11134cd89d35b5421d269e52ab7715318d0e180
Fixes:
36899914
Bug:
64155983
TreeHugger Robot [Wed, 20 Dec 2017 20:08:28 +0000 (20:08 +0000)]
Merge "Improve Fragment+Loader deprecation Javadoc"
Dmitry Dementyev [Tue, 19 Dec 2017 19:02:54 +0000 (11:02 -0800)]
Add more methods to RecoverableKeyStoreLoader.
1) Methods to get key status.
2) Register pending intent to get notification about new recovery
snapshots.
Test: none
Bug:
66499222
Change-Id: I4d5f8c1a6581b5e08f4589e19961d93c499689e1
Philip P. Moltmann [Wed, 20 Dec 2017 19:31:34 +0000 (19:31 +0000)]
Merge "Don't include mockito in frameworks-base-testutils" am:
f924642729 am:
cf7aa7c09e
am:
30d2c14006 -s ours
Change-Id: Id53b8f79a485f48d942d592d4ab6192f8545e356
Philip P. Moltmann [Wed, 20 Dec 2017 19:18:45 +0000 (19:18 +0000)]
Merge "Don't include mockito in frameworks-base-testutils" am:
f924642729
am:
cf7aa7c09e
Change-Id: I6b2486c69af1a05f8282a0d648403522adf2b471
Stan Iliev [Wed, 20 Dec 2017 17:22:59 +0000 (12:22 -0500)]
Improve nine patch scaling
Apply separate coefficient for X and Y, when scaling nine patch
lattice dividers. This is reducing rounding error and fixing
a nine patch issue in Clock app alarm background.
There are other issues in nine patch scaling (see ag/
3378768).
Test: Ran clock app
Bug:
70353853
Change-Id: Ibbbfddc47767fb3314cdb88820e520b3f472e727
Philip P. Moltmann [Wed, 20 Dec 2017 19:09:03 +0000 (19:09 +0000)]
Merge "Don't include mockito in frameworks-base-testutils"
am:
f924642729
Change-Id: I4470f63baac7bc33dff0dac94da3a0d93c322dc7
TreeHugger Robot [Wed, 20 Dec 2017 19:02:49 +0000 (19:02 +0000)]
Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)"
Phil Weaver [Wed, 20 Dec 2017 19:02:40 +0000 (19:02 +0000)]
Merge "Make accessibility anchor id a long"
Benedict Wong [Wed, 20 Dec 2017 18:58:30 +0000 (18:58 +0000)]
Merge "[ipsec-doze] Add fchown to IpSecService to support doze" am:
4edb4c8ec4 am:
5949912523
am:
53a0c20517
Change-Id: Id6a5ff71ead4566b9a91b9e9b6c78d81f1ac0f54
Treehugger Robot [Wed, 20 Dec 2017 18:55:14 +0000 (18:55 +0000)]
Merge "Don't include mockito in frameworks-base-testutils"
TreeHugger Robot [Wed, 20 Dec 2017 18:49:51 +0000 (18:49 +0000)]
Merge "Don't include mockito in frameworks-base-testutils"
TreeHugger Robot [Wed, 20 Dec 2017 18:47:20 +0000 (18:47 +0000)]
Merge "Fix wrong wallpaper AoD state"
Mady Mellor [Wed, 20 Dec 2017 17:57:53 +0000 (09:57 -0800)]
Add subtype for priority
Intended to use with SliceItem type int to note the priority of an item
(such as an action) within a template.
Test: none
Bug:
68378561
Change-Id: I109adf4ea77638b7d27f3aaa7f8eb1c325287f0c
Benedict Wong [Wed, 20 Dec 2017 18:42:26 +0000 (18:42 +0000)]
Merge "[ipsec-doze] Add fchown to IpSecService to support doze" am:
4edb4c8ec4
am:
5949912523
Change-Id: I9036fc2768dd9664ab7407b359f3c689c7ce700e
Eugene Susla [Thu, 7 Dec 2017 19:23:50 +0000 (11:23 -0800)]
Communicate relevantEvents=0 for packages excluded from whitelist
Together with checking isObservableEventType this will result in a11y events
not being generated for packages that are excluded form a11y-service(s)
package whitelist
Test: cts-tradefed run singleCommand cts -d --module CtsAccessibilityServiceTestCases
Change-Id: Id65607aaccc7af7d870d009d609917ff3c6d0712
Benedict Wong [Wed, 20 Dec 2017 18:35:45 +0000 (18:35 +0000)]
Merge "[ipsec-doze] Add fchown to IpSecService to support doze"
am:
4edb4c8ec4
Change-Id: I75a3cb9e9d9d7d3b6c0ede86074a00ddcd86028e
Benedict Wong [Wed, 20 Dec 2017 18:25:32 +0000 (18:25 +0000)]
Merge "[ipsec-doze] Add fchown to IpSecService to support doze"
Ian Lake [Mon, 18 Dec 2017 18:36:18 +0000 (10:36 -0800)]
Improve Fragment+Loader deprecation Javadoc
Make it clear that the framework versions of
Fragments and Loaders should be replaced with their
identically named versions in the Support Library.
Reference the recent work on Lifecycle as an example
of a Support Library only change that should motivate
developers to switch to the Support Library
equivalents.
Test: Reviewed new Javadoc
BUG:
70336450
Change-Id: I93151fa0a316bba824c2e55f80f7de9d30bed3c6
TreeHugger Robot [Wed, 20 Dec 2017 18:06:17 +0000 (18:06 +0000)]
Merge "Cherrypick from from oc-mr1-dev doc: Fixing Javadoc formatting. Original-Change-Id: I5ee04bb96234441c5740665540b5e803fcf9710f"
TreeHugger Robot [Wed, 20 Dec 2017 18:05:53 +0000 (18:05 +0000)]
Merge changes I0face862,If2d091e5,I4e18e63f
* changes:
AAPT2: Sort artifacts based on the Play Store rules.
AAPT2: Allow empty group definitions
AAPT2: Get list of multi-APK artifacts without APK file
Eric Schwarzenbach [Wed, 20 Dec 2017 18:04:55 +0000 (18:04 +0000)]
Merge "Add new Wifi settings notification drawable."
Fyodor Kupolov [Wed, 20 Dec 2017 18:03:32 +0000 (18:03 +0000)]
Merge "Offload switchUser calls to worker threads"
Sanket Padawe [Wed, 20 Dec 2017 17:57:42 +0000 (17:57 +0000)]
Merge "Implement Call handover initiation side APIs." am:
e2d080481a am:
9053309827
am:
875fd19c48 -s ours
Change-Id: I2176b3a20ed52d5bae63cf30853385b33ed9f96a
TreeHugger Robot [Wed, 20 Dec 2017 17:50:24 +0000 (17:50 +0000)]
Merge "1/ index app name. 2/ fix a bug in app update."
Sanket Padawe [Wed, 20 Dec 2017 17:48:58 +0000 (17:48 +0000)]
Merge "Implement Call handover initiation side APIs." am:
e2d080481a
am:
9053309827
Change-Id: I98828fd1ef99d42ffbfb8650731c1d2b848bc062
TreeHugger Robot [Wed, 20 Dec 2017 17:44:01 +0000 (17:44 +0000)]
Merge "Log d when transport updates its attributes"
Sanket Padawe [Wed, 20 Dec 2017 17:41:13 +0000 (17:41 +0000)]
Merge "Implement Call handover initiation side APIs."
am:
e2d080481a
Change-Id: Ib9840c4ce4abf64f36e21cbc3256050e4216314b
TreeHugger Robot [Wed, 20 Dec 2017 17:39:21 +0000 (17:39 +0000)]
Merge "Update setLineSpacing docs to mention units"
Arthur Ishiguro [Wed, 20 Dec 2017 17:35:00 +0000 (09:35 -0800)]
Rename ContextHubTransaction.Result IntDef
Use RESULT_ instead of TRANSACTION_ to be consistent with the name.
Bug:
67734082
Test: make
Change-Id: Ib7cc4d527cc160ec6788449231cdffa5c3e8fc0d
Sanket Padawe [Wed, 20 Dec 2017 17:33:45 +0000 (17:33 +0000)]
Merge "Implement Call handover initiation side APIs."
TreeHugger Robot [Wed, 20 Dec 2017 17:20:27 +0000 (17:20 +0000)]
Merge "Add MessagingStyle#isGroupConversation()."
TreeHugger Robot [Wed, 20 Dec 2017 17:02:38 +0000 (17:02 +0000)]
Merge "WorkSource: Add support for chaining attribution."
TreeHugger Robot [Wed, 20 Dec 2017 16:53:25 +0000 (16:53 +0000)]
Merge "Update GLUtils to support F16"
Aurimas Liutikas [Wed, 20 Dec 2017 16:35:22 +0000 (16:35 +0000)]
Fix broken MenuLayoutPortraitTest
Change-Id: Ic24bfbdc5d9aeb286e1f1ba589896331bb8aa2ba
Test: None
Adrian Roos [Wed, 20 Dec 2017 16:33:20 +0000 (16:33 +0000)]
Merge "Display Cutout: Make API public"
Robert Berry [Wed, 20 Dec 2017 13:50:37 +0000 (13:50 +0000)]
Back PlatformKeyManager with database
It was previously using SharedPreferences
Test: adb shell am instrument -w -e package com.android.server.locksettings.recoverablekeystore com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I76a75edb93a3feca645e49162c0d8b3e9485385b
Robert Berry [Mon, 18 Dec 2017 14:50:23 +0000 (14:50 +0000)]
Add tests for KeySyncUtils now that SecureBox is available
SecureBox is to be merged before this.
Test: adb shell am instrument -w -e package com.android.server.locksettings.recoverablekeystore com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I40f783c165faa595c8913ff073915726ae71524d
Bernardo Rufino [Wed, 20 Dec 2017 15:35:52 +0000 (15:35 +0000)]
Log d when transport updates its attributes
Bug:
17140907
Test: Triggered an update and checked logs
Change-Id: I21926086ec0078872f3840737f77f79417178f6c
Android Build Merger (Role) [Wed, 20 Dec 2017 15:32:15 +0000 (15:32 +0000)]
Merge "Merge "Add support for selecting alternate JDWP implementations" am:
cbeea23861 am:
f5ec7f2e26 am:
b24c17efa3"
Alex Light [Wed, 20 Dec 2017 15:31:14 +0000 (15:31 +0000)]
Merge "Add support for selecting alternate JDWP implementations" am:
cbeea23861 am:
f5ec7f2e26
am:
b24c17efa3
Change-Id: I200e5430fd9696affa37f6330999379173837f2b
TreeHugger Robot [Wed, 20 Dec 2017 15:27:19 +0000 (15:27 +0000)]
Merge "AAPT2: Add flag to compile command for outputting symbols"
Alex Light [Wed, 20 Dec 2017 15:21:59 +0000 (15:21 +0000)]
Merge "Add support for selecting alternate JDWP implementations" am:
cbeea23861
am:
f5ec7f2e26
Change-Id: I95d3064791d497986d0ece010be05749904d1ed3
TreeHugger Robot [Wed, 20 Dec 2017 15:18:27 +0000 (15:18 +0000)]
Merge "AAPT2: treat manifest validation errors as warnings when asked"
Alex Light [Wed, 20 Dec 2017 15:13:34 +0000 (15:13 +0000)]
Merge "Add support for selecting alternate JDWP implementations"
am:
cbeea23861
Change-Id: Ifa4ffb6610152f1e919bc10fc7c8697c4bb99a0d
Narayan Kamath [Thu, 7 Dec 2017 15:45:33 +0000 (15:45 +0000)]
WorkSource: Add support for chaining attribution.
WorkSource objects now hold references to zero or more WorkChain
objects, each of which represent a "chain" of attribution.
This change also changes most WorkSource APIs to be able to
deal with WorkChains. Several APIs do not necessarily make sense with
WorkChains and have been left unmodified :
- boolean diff(WorkSource): Does not account for WorkChains for now.
This is a public API so we shouln't change it unless we decide to
make WorkChains public.
- setReturningDiffs(WorkSource): Used internally only, will be removed
in a future change.
- addReturningNewbs(WorkSource): Used for testing only, fill be removed
in a future change.
In addition, two new (hidden) APIs have been added to add and query
WorkChains. These APIs have only been added to facilitate testing. They
will most likely change when we add non-test users.
Co-Authored-By: Yang Lu <yanglu@google.com>
Test: WorkSourceTest
Bug:
62390666
Change-Id: Iff361eb98e079c7b2146c092dc27a3618a813c94
Paul Duffin [Wed, 20 Dec 2017 15:09:19 +0000 (15:09 +0000)]
Merge changes from topic "fix-atm-visibility-issues"
* changes:
Add android.test.mock.stubs-system
Fix visibility issues with android.test.mock.stubs
Alex Light [Wed, 20 Dec 2017 15:04:10 +0000 (15:04 +0000)]
Merge "Add support for selecting alternate JDWP implementations"
Tony Mak [Tue, 12 Dec 2017 11:00:37 +0000 (11:00 +0000)]
Add access control to trySetWorkModeEnabled and make it public
Test: Quick Settings -> Toggle work mode
Test: Settings -> Work profile settings -> Toggle work mode
Test: Turn off work mode -> Settings -> Turn on work mode in the suggestion
Test: Turn on work mode through tapping on work app
Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.QuietModeHostsideTest
BUG:
70212757
Change-Id: I335c3ab2306a3eb794cd35a3a7b0d184dc31f85e
Robert Berry [Tue, 19 Dec 2017 10:44:56 +0000 (10:44 +0000)]
Use RecoverableKeyStoreDb in RecoverableKeyGenerator
This removes the layer of abstraction provided by RecoverableKeyStorage,
as it doesn't seem particularly useful, given how easy it is to just use
the real classes in tests. This also hooks up actually saving to the
database. I've modified the class so that you can have a single instance
for generating keys and just pass the 'uid' through, rather than having
to create a new instance per uid. I think this will simplify its use.
Also it no longer returns the key handle. As you can just get it out of
the AndroidKeyStore yourself, it doesn't seem useful to have the method
also do that.
Test: adb shell am instrument -w -e package com.android.server.locksettings.recoverablekeystore com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Ice144a84690150648cbb5da64c8a4cecc2576349
Izabela Orlowska [Tue, 19 Dec 2017 16:22:42 +0000 (16:22 +0000)]
AAPT2: treat manifest validation errors as warnings when asked
Bug:
65670329
Test: updated
Change-Id: Ic554cc20134fce66aa9ddf8d16ddffe0131c50e9
Narayan Kamath [Wed, 20 Dec 2017 12:39:40 +0000 (12:39 +0000)]
Merge "WorkSource: Remove unused WorkSource.stripNames."
Izabela Orlowska [Tue, 5 Dec 2017 12:07:28 +0000 (12:07 +0000)]
AAPT2: Add flag to compile command for outputting symbols
Only XML files can define resources inside of them, so the fragment
R.txt will only be created for XML files. The fragment R.txt will
contain files defined inside the XML files and the file itself.
For example for res/layout/my_layout.xml that defines "@+id/myView" the
fragment R.txt will contain "default int id myView" and "default int
layout my_layout".
Resources defined with the "public" keyword will have the word "public"
in the partial R.txt, resources defined with the "java-symbol" keyword
will have the word "private, and all other resources will have the word
"default".
If a string is declared in values/strings.xml as:
'<string name="foo">text</string>'
then the partial R.txt will contain "default int string foo". If the
same string is also marked as public in the values/public.xml as:
'<public type="string" name="foo" id="0x7f000001"/>
then the partial R.txt for that file will cointain:
"public int string foo".
Also, the resource IDs will be skipped as this is only for compilation,
proper IDs will be generated at linking phase.
Test: manual
Change-Id: I37d07d5ee4a9f2e5a60a54e48579eba86ae7dd60
TreeHugger Robot [Wed, 20 Dec 2017 11:58:32 +0000 (11:58 +0000)]
Merge "Deprecate StaticLayout and DynamicLayout constructors"
Joachim Sauer [Wed, 20 Dec 2017 11:23:31 +0000 (11:23 +0000)]
Merge "Make getGmtOffsetText public."
Robert Berry [Wed, 20 Dec 2017 10:49:09 +0000 (10:49 +0000)]
Merge "Add storage for platform key IDs to SQLite db"
Clara Bayarri [Tue, 19 Dec 2017 16:59:34 +0000 (16:59 +0000)]
Update setLineSpacing docs to mention units
Bug:
64896499
Test: none, docs update
Change-Id: I1b94005643764f6484dca2b02845adde7135a37e
TreeHugger Robot [Wed, 20 Dec 2017 08:43:56 +0000 (08:43 +0000)]
Merge "DPM: Implement installing certificates for generated keys"
Bo Zhu [Wed, 20 Dec 2017 08:13:12 +0000 (08:13 +0000)]
Merge "Implement the SecureBox crypto functions"
TreeHugger Robot [Wed, 20 Dec 2017 05:45:49 +0000 (05:45 +0000)]
Merge changes I7cd58841,I800bde6f
* changes:
Implements getContextHubs
Merges ContextHubService notion of hub ID/handle
TreeHugger Robot [Wed, 20 Dec 2017 04:22:33 +0000 (04:22 +0000)]
Merge "OutputConfiguration: Fix missing mIsShared in parcel read"