221737 Commits

Author SHA1 Message Date
Chad Brubaker
ead46ecc84 Merge "Add xml source for network security configuration" 2015-11-07 22:10:50 +00:00
Adam Lesinski
caf4a89f18 Merge "AAPT2: Disambiguate merging of resources" 2015-11-07 22:09:37 +00:00
Adam Lesinski
fa10505cea AAPT2: Accept aliases defined for external resource types
Resource types that are typically stored outside of the resource table
(like layout, xml, drawable) can only have aliases (reference to another
resource).

Change-Id: Idb768801f02bb142e5be5e438904f221499bd756
2015-11-07 13:34:39 -08:00
Chad Brubaker
bd173c28fc Support nested domain-config elements
Nested domain-config inherit unset parameters from the domain-config
they are nested in. This helps avoid copy and pasted configs that are
almost the same except a few minor differences for a domain with
slightly different requirements.

For example: Consider a domain-config for example.com that, among other
settings, does not enforce hsts. Now if you want the rules for
example.com to apply to secure.example.com except that hsts _is_
enforced you can make a nested domain-config for secure.example.com
under example.com that sets hstsEnforced="true" and nothing else.

Change-Id: I9e33f7e62127fd7f4f15c3560fff2f2626477bd4
2015-11-07 13:31:04 -08:00
Roozbeh Pournader
47f71a697a Use the full locale list in resourceQualifierString().
Previously, only the first locale was dumped to the output in
android.content.res.Configuration#resourceQualifierString(). Now the full
locale list is part of the output.

Change-Id: I5d4b73738a14d48533ee96c38dbc6c4b204ea998
2015-11-07 11:55:38 -08:00
Adam Lesinski
83f2255f69 AAPT2: Disambiguate merging of resources
Merging local app resources is slightly different than merging
resources from a static library.

Local app resources may not have a package name set, but we do take interest in the
ID set for the package (should be 0x0 or match the ID of the app we're building).

Static library resources have an explicit package name defined for them, so we
only merge resources from that package.

Change-Id: I95e559ae94cc1df6972e77a347b1b37a93674c4d
2015-11-07 11:51:23 -08:00
Roozbeh Pournader
0d02bd8442 Removed unused setLocale() method.
The setLocale() method in android.content.res.AssetManager was not
used. Removing it to reduce maintenance cost.

Change-Id: I1b168fe84c2465d1ebc2b62bb965eda885e1220a
2015-11-07 11:22:24 -08:00
Adam Lesinski
b444afc0f4 Merge "AAPT2: Add support for clearer in-progress public attributes" 2015-11-07 18:07:01 +00:00
Chad Brubaker
5f96702f58 Add xml source for network security configuration
XmlConfigSource parses an ApplicationConfig from an xml resource.
Currently this supports app-wide default configuration via the
base-config element, per domain via the domain-config element and
inheritance of unset properties at parse time.

Inheritance of unset properties is currently only:
domain-config -> base-config -> platform default configuration
Where the most specific value is used.
For example: If the base-config specifies trust anchors, all connections
will use those anchors except for connections to a domain which has a
domain-config that specifies trust anchors, in which case the
domain-config's trust anchors will be used. If the domain-config or
base-config don't set trust anchors, or don't exist, then the platform
default trust anchors will be used.

Nested domain-config entries, debug-overrides, and thorough
documentation of the xml format will follow in later commits.

Change-Id: I1232ff1e8079a81b340bc12e142f0889f6947aa0
2015-11-06 22:24:01 -08:00
Chad Brubaker
eea9672b3d Merge "Fix incorrect hstsEnforced lookup" am: 1347cb81f4 am: 90b9ed5c82
am: d28d4bcf9b

* commit 'd28d4bcf9b6c9d8142fbed995250d41a59387c72':
  Fix incorrect hstsEnforced lookup
2015-11-07 02:53:50 +00:00
Chad Brubaker
d28d4bcf9b Merge "Fix incorrect hstsEnforced lookup" am: 1347cb81f4
am: 90b9ed5c82

* commit '90b9ed5c82f5a3bd754bebe69a8883b65d3f95cc':
  Fix incorrect hstsEnforced lookup
2015-11-07 02:47:59 +00:00
Chad Brubaker
90b9ed5c82 Merge "Fix incorrect hstsEnforced lookup"
am: 1347cb81f4

* commit '1347cb81f402c628f3346ea350a5862749901d59':
  Fix incorrect hstsEnforced lookup
2015-11-07 02:42:05 +00:00
Chad Brubaker
1347cb81f4 Merge "Fix incorrect hstsEnforced lookup" 2015-11-07 02:37:45 +00:00
Jeff Sharkey
94d0b64d4f Merge "Initial file-based encryption public APIs." 2015-11-07 02:37:21 +00:00
Jeff Sharkey
15447798a3 Initial file-based encryption public APIs.
Define two explicit directories where device-encrypted and
credential-encrypted data will be stored.  Third-party apps only
need access to the device-encrypted directory, so that's the only
API exposed for now.

General cleanup in how ApplicationInfo details are derived.

Bug: 22358539
Change-Id: If0a0108721a4aa1c3052b4912e08604bbf24e1ae
2015-11-06 18:35:27 -08:00
Adam Lesinski
6a85b54d50 Merge "AAPT2: Fix inclusion of comments in R.java javadoc" 2015-11-07 02:31:20 +00:00
Adam Lesinski
27afb9e889 AAPT2: Add support for clearer in-progress public attributes
Before, the ID assigned to a public resource without an explicitly set id
was more difficult to figure out. It would be the next available ID.

AAPT2 introduces a new way to specify public attributes in progress.

<public-group type="attr" first-id="0x0101047f">
  <public name="foo" />
  <public name="bar" />
  ...
</public-group>

The IDs assigned to each resource is auto-incremented starting from `first-id`.
This also keeps resource's with the same type grouped together so that
the auto-incrementing nature is evident.

Also, due to how AAPT2 was implemented, this is required :P

Change-Id: I95ea92ad0405e87ed0b1766879bb2f1d9d0b636e
2015-11-06 18:25:04 -08:00
Chad Brubaker
825c3f91ed Fix incorrect hstsEnforced lookup
Change-Id: I00364d8c1d3311bebd3ad88e557860e694ba5018
2015-11-06 18:08:12 -08:00
Makoto Onuki
7d22f8b64c Merge "Make sure to persist user restrictions in UMS" 2015-11-07 01:21:13 +00:00
Jim Miller
d72d5ac598 Log fingerprint state in KeyguardUpdateMonitor.
Attempt to track down bug 24508587

Change-Id: Ifb998e2752ec515c36dd302c2abeb1ab27f3a2f3
2015-11-07 00:48:33 +00:00
Suprabh Shukla
a50a8ec06f Merge "Fixing recent tasks not getting restored at startup" 2015-11-07 00:44:18 +00:00
Adam Lesinski
b274e35abf AAPT2: Fix inclusion of comments in R.java javadoc
Comments weren't being copied when merged from the various
resource tables.

Also refactored the JavaClassGenerator to omit a class
if no entries exist for it.

Change-Id: I6eaa89b7b3715bc05403635a2baf0d1db3efd142
2015-11-06 16:37:57 -08:00
Suprabh Shukla
74f9f165c2 Fixing recent tasks not getting restored at startup
Check for empty list before reading activity at index 0.

Change-Id: If87e3c4d2cedd86fdb427ddfb27d1f32f8f93412
2015-11-07 00:15:31 +00:00
Tao Bai
788f7433bd Merge "Add test to cover loading shared-lib with appAsLib as true. This patch made AppAsLib_test use its own resource" 2015-11-06 23:49:40 +00:00
George Mount
e998c3f5f6 Improve DatePicker focus for keyboards.
Bug 24873983

Focus moves properly within the SimpleMonthView and between
components of the DatePicker.

Change-Id: I61778f9b4f19536ff6c7a512f9b4faf7bf4447a7
2015-11-06 15:48:52 -08:00
Winson
13d30660ef Fixing issue with canceling the thumbnail in addition to the app window.
Bug: 25392381
Change-Id: Ib507f53bcd2aad4771c2546f5e8bfe771769e9a2
2015-11-06 15:30:29 -08:00
Winson
7395ef0cdb Reverting debug flag.
Change-Id: I918d43827ecd7be52b41fb632850775161aa3902
2015-11-06 14:54:41 -08:00
Tao Bai
dd337646a9 Using addAssetPathAsSharedLibrary to load asset.
This will alllow framework to overrdie the resource id even the
package resource is app.

Change-Id: I176166e7c51ceb5e84101deb3f467a826f484251
2015-11-06 14:43:12 -08:00
Winson
6b92c6e524 Adding fast alt-tab trigger to prevent full animation.
Change-Id: I3df7a99977d0c2687eea084a95a0953429e8ff47
2015-11-06 14:42:14 -08:00
Tao Bai
1375e5f180 Add test to cover loading shared-lib with appAsLib as true.
This patch made AppAsLib_test use its own resource

Bug 22487604

Change-Id: Iac4cc949f1b25c326a287a49e0b031bf6831e9e9
2015-11-06 14:33:49 -08:00
Makoto Onuki
9e935a3bc9 Make sure to persist user restrictions in UMS
Bug 25565111

Change-Id: Ic48ce728a1c2b55d70276a37b9a359407167edf1
2015-11-06 14:24:24 -08:00
Winson
1b58561f66 Fixing up some more focus edge cases.
- Disallow touch while alt-tabbing
- Allow keyboard to focus tab while scrolling
- Cleaning up some old classes that aren’t really being used

Change-Id: Ibabea093afb711b07f398677d25735421b7c7e53
2015-11-06 13:48:45 -08:00
Chad Brubaker
6e92454065 Merge "Fix directory check in UserCertificateSource" am: 1483ee3aa5 am: 2d7d8401a9
am: a8fd356640

* commit 'a8fd35664070134f0596238ad0c5bdaa3adc221b':
  Fix directory check in UserCertificateSource
2015-11-06 21:28:24 +00:00
Chad Brubaker
52fe096d86 Merge "Fix incorrect hasPerDomainConfigs check" am: c5c51dafb3 am: dd6d0918c4
am: a21b4a528d

* commit 'a21b4a528dc7c728b3546899c90758d583f35495':
  Fix incorrect hasPerDomainConfigs check
2015-11-06 21:26:55 +00:00
Chad Brubaker
74e67e04a5 Merge "Use a builder for NetworkSecurityConfig" am: 7e98f2e697 am: 478fad3cf5
am: 54b4b8fdfc

* commit '54b4b8fdfc336b8a4902637e622c3ede879edcde':
  Use a builder for NetworkSecurityConfig
2015-11-06 21:25:31 +00:00
Chad Brubaker
a8fd356640 Merge "Fix directory check in UserCertificateSource" am: 1483ee3aa5
am: 2d7d8401a9

* commit '2d7d8401a9c1e03f8f141415b25cfb415df73695':
  Fix directory check in UserCertificateSource
2015-11-06 21:19:02 +00:00
Alan Viverette
9db60f4e5b Merge "Mutate DrawableContainer children immediately after inflation" 2015-11-06 21:17:36 +00:00
Chad Brubaker
a21b4a528d Merge "Fix incorrect hasPerDomainConfigs check" am: c5c51dafb3
am: dd6d0918c4

* commit 'dd6d0918c42aec3fb08d6df15822078e35cc4f33':
  Fix incorrect hasPerDomainConfigs check
2015-11-06 21:17:34 +00:00
Chad Brubaker
2d7d8401a9 Merge "Fix directory check in UserCertificateSource"
am: 1483ee3aa5

* commit '1483ee3aa5737f9aff06021b5ec9fe3086ee2e66':
  Fix directory check in UserCertificateSource
2015-11-06 21:10:54 +00:00
Chad Brubaker
dd6d0918c4 Merge "Fix incorrect hasPerDomainConfigs check"
am: c5c51dafb3

* commit 'c5c51dafb3ede95622eb350dae0b662abb611925':
  Fix incorrect hasPerDomainConfigs check
2015-11-06 21:09:11 +00:00
Jorim Jaggi
c97ba49d23 Update divider shadow when it is moving
Change-Id: Ifc67ba3ee640929248cad6479d9c0df818e32f40
2015-11-06 21:08:57 +00:00
Chad Brubaker
1483ee3aa5 Merge "Fix directory check in UserCertificateSource" 2015-11-06 21:02:23 +00:00
Chad Brubaker
c5c51dafb3 Merge "Fix incorrect hasPerDomainConfigs check" 2015-11-06 21:02:01 +00:00
Chad Brubaker
b0f8b4bb35 Fix directory check in UserCertificateSource
If the user has not added any CAs to the user trust store the user-added
directory will not have been created.

Change-Id: I8b5f73af3c0761c56969874231004fedbf7badda
2015-11-06 13:00:15 -08:00
Chad Brubaker
35de8d6d2b Fix incorrect hasPerDomainConfigs check
Change-Id: Iaeedbbcc5f12475d346a77dba84b38a1d3d8d346
2015-11-06 12:50:31 -08:00
Jorim Jaggi
1a2f3ab485 Fix build
Change-Id: Ie716bbec49920af459ceddf8e51387ccf5946a7f
2015-11-06 20:35:00 +00:00
Chad Brubaker
54b4b8fdfc Merge "Use a builder for NetworkSecurityConfig" am: 7e98f2e697
am: 478fad3cf5

* commit '478fad3cf53874f9cc96169cd25b29b9c031637a':
  Use a builder for NetworkSecurityConfig
2015-11-06 20:31:02 +00:00
Chad Brubaker
478fad3cf5 Merge "Use a builder for NetworkSecurityConfig"
am: 7e98f2e697

* commit '7e98f2e6976fb38c5c3a7421547d1756ba5faafe':
  Use a builder for NetworkSecurityConfig
2015-11-06 20:25:33 +00:00
Jorim Jaggi
ea1e8ecf5e Don't kill process when dismissing stack
Also clear the binder identity to incorrect permission
checks, which lead to crashes when dismissing the docked
stack.

Change-Id: I53175769745e8bbdbc296806b9297eb3c53d4452
2015-11-06 20:23:23 +00:00
Alan Viverette
9b4bdeff6d Mutate DrawableContainer children immediately after inflation
Previously we would only mutate children when they were displayed, so
applyTheme() calls would be applied to the shared constant state. Now
we mutate() immediately after obtaining the child, which ensures we
have a clean constant state. This also allows us to remove extra
mutate() calls, since we know all child drawables are already mutated.

Bug: 25081461
Change-Id: I52390db268690a8e181f5b9bbe612b7ed6ce9359
2015-11-06 15:22:43 -05:00