drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
213,127 Commits 1 Branch 0 Tags
Commit Graph

213127 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
bd4d7ed031 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: f3b3a2ce2b -s ours 
am: 919b74ae35  -s ours

* commit '919b74ae355102deb2e6c35e95803edf29cea1d6':
  Import translations. DO NOT MERGE
 2015-11-09 18:02:10 +00:00
Geoff Mendal
919b74ae35 Merge "Import translations. DO NOT MERGE" into cw-e-dev 
am: f3b3a2ce2b  -s ours

* commit 'f3b3a2ce2bc9b3f5eb6c96b7a828d245c84cc203':
  Import translations. DO NOT MERGE
 2015-11-09 17:57:11 +00:00
Geoff Mendal
f3b3a2ce2b Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-11-09 17:51:40 +00:00
Geoff Mendal
016d9e7c4d Import translations. DO NOT MERGE 
Change-Id: I58434476f0ed8edce61cd6827f25842d2f546340
Auto-generated-cl: translation import
 2015-11-09 18:43:57 +01:00
Geoff Mendal
fc2d271539 Import translations. DO NOT MERGE am: 49eeda33dd -s ours am: 0414438abe -s ours 
am: 9ab5fb52a0  -s ours

* commit '9ab5fb52a0d2d03b86a3862363f0594356a90bcd':
  Import translations. DO NOT MERGE
 2015-11-09 17:39:01 +00:00
Geoff Mendal
9ab5fb52a0 Import translations. DO NOT MERGE am: 49eeda33dd -s ours 
am: 0414438abe  -s ours

* commit '0414438abe0718f5007d7b580981d6ba204b655c':
  Import translations. DO NOT MERGE
 2015-11-09 17:34:42 +00:00
Geoff Mendal
0414438abe Import translations. DO NOT MERGE 
am: 49eeda33dd  -s ours

* commit '49eeda33ddca15ff8b8e820d1cf68a99cde9806a':
  Import translations. DO NOT MERGE
 2015-11-09 17:27:25 +00:00
Geoff Mendal
49eeda33dd Import translations. DO NOT MERGE 
Change-Id: I664d6f94b74430f003182bc72db6610521883fa9
Auto-generated-cl: translation import
 2015-11-09 18:10:12 +01:00
Geoff Mendal
16c692f57f Import translations. DO NOT MERGE am: 210f0afaf9 -s ours 
am: a1d0738253  -s ours

* commit 'a1d07382539525a44baf0ca581e04fb445639831':
  Import translations. DO NOT MERGE
 2015-11-09 13:37:24 +00:00
Geoff Mendal
a1d0738253 Import translations. DO NOT MERGE 
am: 210f0afaf9  -s ours

* commit '210f0afaf9011d044d261f1044a1a7368cb89e7e':
  Import translations. DO NOT MERGE
 2015-11-09 13:29:12 +00:00
Geoff Mendal
210f0afaf9 Import translations. DO NOT MERGE 
Change-Id: I45eaf276af6efa775e2e7c0a7cd8040fbf13e32e
Auto-generated-cl: translation import
 2015-11-09 05:11:08 -08:00
Chad Brubaker
8427d98f7c Merge "Support nested domain-config elements" am: 749501e88e 
am: b549899d0b

* commit 'b549899d0b6b95032a9c75e64c9276acd85510d1':
  Support nested domain-config elements
 2015-11-07 22:23:00 +00:00
Chad Brubaker
06d93173b1 Merge "Add xml source for network security configuration" am: ead46ecc84 
am: 0cb8f01410

* commit '0cb8f014105b9e8e3bdb12cf091ef61e8c575333':
  Add xml source for network security configuration
 2015-11-07 22:21:40 +00:00
Chad Brubaker
b549899d0b Merge "Support nested domain-config elements" 
am: 749501e88e

* commit '749501e88e5fa6bdc6594a9db5c232e31bdda867':
  Support nested domain-config elements
 2015-11-07 22:16:10 +00:00
Chad Brubaker
0cb8f01410 Merge "Add xml source for network security configuration" 
am: ead46ecc84

* commit 'ead46ecc843e3686ff5ae8008f4452fc79f847e7':
  Add xml source for network security configuration
 2015-11-07 22:14:36 +00:00
Chad Brubaker
749501e88e Merge "Support nested domain-config elements" 2015-11-07 22:11:04 +00:00
Chad Brubaker
ead46ecc84 Merge "Add xml source for network security configuration" 2015-11-07 22:10:50 +00: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
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
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
Chad Brubaker
825c3f91ed Fix incorrect hstsEnforced lookup 
Change-Id: I00364d8c1d3311bebd3ad88e557860e694ba5018
 2015-11-06 18:08:12 -08: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
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
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
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
Chad Brubaker
7e98f2e697 Merge "Use a builder for NetworkSecurityConfig" 2015-11-06 20:21:29 +00:00
Chris Elliott
8d19637651 DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE am: d9a2be8d3d -s ours am: 634221adb2 
am: 54919264d8

* commit '54919264d8ab758a29c6d417d7bcd5a949c0b6e9':
  DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE
 2015-11-06 18:46:32 +00:00
Chris Elliott
54919264d8 DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE am: d9a2be8d3d -s ours 
am: 634221adb2

* commit '634221adb28f765233889cca32078e4b042198f3':
  DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE
 2015-11-06 18:41:35 +00:00
Chris Elliott
634221adb2 DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE 
am: d9a2be8d3d  -s ours

* commit 'd9a2be8d3d5bd0e170fec71c316373e268a8c17f':
  DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE
 2015-11-06 18:36:16 +00:00
Chris Elliott
d9a2be8d3d DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE 
This reverts commit 7e19e286cc990daaafe934ed82ddfa00762907d6.

Change-Id: I808047efe13cdbf560d15e1ba081417e866ef83a
 2015-11-06 17:41:17 +00:00
Svetoslav Ganov
66ce9698dc Merge "Take into account default app for default grants" am: 7abb36599d 
am: 57fb4bd4f7

* commit '57fb4bd4f704c93ff73e055e6602ee18f7dbf669':
  Take into account default app for default grants
 2015-11-06 00:46:35 +00:00
Svetoslav Ganov
57fb4bd4f7 Merge "Take into account default app for default grants" 
am: 7abb36599d

* commit '7abb36599d9537296d9a51f766152025c6ed0491':
  Take into account default app for default grants
 2015-11-06 00:40:48 +00:00
Svetoslav Ganov
88cdc715c0 Merge "Revert "Take into account default app for default grants"" am: 9ae3aeec53 
am: 0c4ce4474f

* commit '0c4ce4474ff0020b2b041f26fb00efbdc0783285':
  Revert "Take into account default app for default grants"
 2015-11-06 00:36:44 +00:00
Svetoslav Ganov
7abb36599d Merge "Take into account default app for default grants" 2015-11-06 00:34:21 +00:00
Svetoslav
5d05bbea5f Take into account default app for default grants 
Change-Id: Ib78c7dbda65d405bbf74544cad18e5e10bfcdeec
 2015-11-05 16:33:05 -08:00
Svetoslav Ganov
0c4ce4474f Merge "Revert "Take into account default app for default grants"" 
am: 9ae3aeec53

* commit '9ae3aeec532ce5a7908d395049efb61399875360':
  Revert "Take into account default app for default grants"
 2015-11-06 00:31:13 +00:00
Svetoslav Ganov
9ae3aeec53 Merge "Revert "Take into account default app for default grants"" 2015-11-06 00:24:59 +00:00
Svetoslav Ganov
d2bbf1bf0a Revert "Take into account default app for default grants" 
Apparently OEMs can set the chooser so this patch is not enough since it assumes the chooser is a platform component.

This reverts commit fce33d58d87fd494686aae4e21332b58ec260b73.

Change-Id: I3b8e499d2f0a731a227d193f6c5d6ed528be2272
 2015-11-06 00:24:47 +00:00
Tenghui Zhu
a1d1d184ac Merge "When the incoming light source is invalid, don\'t generate any shadow" am: 3226c57321 
am: cca2857ebb

* commit 'cca2857ebb52d3ba06bbd42de7db2c33e04cf0cc':
  When the incoming light source is invalid, don't generate any shadow
 2015-11-06 00:06:02 +00:00
Tenghui Zhu
cca2857ebb Merge "When the incoming light source is invalid, don\'t generate any shadow" 
am: 3226c57321

* commit '3226c57321f15384ef7c1e93589c6d2a58cbe86c':
  When the incoming light source is invalid, don't generate any shadow
 2015-11-06 00:00:33 +00:00
Tenghui Zhu
3226c57321 Merge "When the incoming light source is invalid, don't generate any shadow" 2015-11-05 23:56:56 +00:00
Teng-Hui Zhu
83ea5b7b22 When the incoming light source is invalid, don't generate any shadow 
b/25417885

Change-Id: I4b87e35ca68091fd0409cb9fe9b9400af860a507
 2015-11-05 15:48:35 -08:00