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

213213 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marco Nelissen
f2cb9341ff Fix race condition when setting default ringtones 
If the device was powered off during first boot, after media scanner
inserted some entries but before the default ringtone settings were
set (or committed to disk), the default settings would not be set
on subsequent boots.

Bug: 18625739
Bug: 22349910
Change-Id: Iff07da59a9c6d53bf2950bd107ee74d02b7f48d6
 2015-11-06 10:50:47 -08: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
Jeff Sharkey
7ecaea83d4 Block directory selection in openable modes. 
When picking documents to return to apps requesting CATEGORY_OPENABLE
we can't let the user select directories.

Bug: 25455200
Change-Id: I8076883ee5b019eab4d2adb841952865f21e413e
 2015-11-06 09:16:22 -08:00
Masaaki Iwaguchi
5b6d99e87a System crash fixed when turn off MagnificationGesture 
Symptom:
WindowManagerService throws exception and system crashes.

Root cause:
When the MagnificationGesture is turned off during animation of scale
up/down, WindowManagerService.mAccessibilityController can be null so
exception is thrown.

Solution:
Cancel ongoing animation before turning off MagnificationGesture.

Change-Id: I469d84e024bdd453e3729a69229398233ed2eb61
 2015-11-06 12:40:14 +01: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
Chad Brubaker
80a73f5939 Use a builder for NetworkSecurityConfig 
The builder supports all the standard builder set* methods as well as
setting a parent builder to use when values are not set (recursively).
This allows us to have a level of inheretence in configurations without
complicating the lookup and trust checking logic by doing inheretence
when building the configs.

Change-Id: I054af83451e52761227479eadf9cb9803437505f
 2015-11-05 12:50:30 -08:00
Chris Craik
1c3dd0519a Merge "Revert "Remove -ffast-math from libhwui makefile"" into mnc-dr-dev am: 0cf48e9120 am: 17fc83cbde 
am: c06ccd77c1

* commit 'c06ccd77c129cdf198c64babdfd8d289aa8ff908':
  Revert "Remove -ffast-math from libhwui makefile"
 2015-11-05 20:37:23 +00:00
Jeff Sharkey
8bad938369 Merge "Kick movement preconditions onto handler thread." into mnc-dr-dev am: e10faaa410 am: 2de7e39ffa 
am: 73d60ff36f

* commit '73d60ff36fbf656d022c2d4f35b8e9f2d25e795f':
  Kick movement preconditions onto handler thread.
 2015-11-05 20:36:00 +00:00
Chris Craik
c06ccd77c1 Merge "Revert "Remove -ffast-math from libhwui makefile"" into mnc-dr-dev am: 0cf48e9120 
am: 17fc83cbde

* commit '17fc83cbde8ab1e92664d12a0fed306e9054ca55':
  Revert "Remove -ffast-math from libhwui makefile"
 2015-11-05 20:31:39 +00:00
Jeff Sharkey
73d60ff36f Merge "Kick movement preconditions onto handler thread." into mnc-dr-dev am: e10faaa410 
am: 2de7e39ffa

* commit '2de7e39ffa387b370e5997542811fd05a73cb8fc':
  Kick movement preconditions onto handler thread.
 2015-11-05 20:30:12 +00:00
Tenghui Zhu
dfaf23f846 Merge "When the incoming light source is invalid, don\'t generate any shadow" into mnc-dr-dev am: 76d20b4a5c am: 1c7fbe0efb 
am: d829ab7683

* commit 'd829ab76831a0c323f669385c54f666f8a91e4f1':
  When the incoming light source is invalid, don't generate any shadow
 2015-11-05 20:27:43 +00:00
Chris Craik
17fc83cbde Merge "Revert "Remove -ffast-math from libhwui makefile"" into mnc-dr-dev 
am: 0cf48e9120

* commit '0cf48e9120fee8e5f0abc7b50a816bb2bc8e6127':
  Revert "Remove -ffast-math from libhwui makefile"
 2015-11-05 20:25:34 +00:00
Jeff Sharkey
2de7e39ffa Merge "Kick movement preconditions onto handler thread." into mnc-dr-dev 
am: e10faaa410

* commit 'e10faaa41026863b9d0f7dd6b0c239ff79586dc7':
  Kick movement preconditions onto handler thread.
 2015-11-05 20:23:46 +00:00
Chris Craik
0cf48e9120 Merge "Revert "Remove -ffast-math from libhwui makefile"" into mnc-dr-dev 2015-11-05 20:21:45 +00:00
Tenghui Zhu
d829ab7683 Merge "When the incoming light source is invalid, don\'t generate any shadow" into mnc-dr-dev am: 76d20b4a5c 
am: 1c7fbe0efb

* commit '1c7fbe0efbabe5c15ba72e16053551a8fdae1b92':
  When the incoming light source is invalid, don't generate any shadow
 2015-11-05 20:20:29 +00:00
Jeff Sharkey
e10faaa410 Merge "Kick movement preconditions onto handler thread." into mnc-dr-dev 2015-11-05 20:17:13 +00:00
Joe LaPenna
bab8dfd793 Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE am: 88c7c3e080 -s ours 
am: efcb281bec  -s ours

* commit 'efcb281bec4a5ec57815204c89c5666ed35f3bcc':
  Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE
 2015-11-05 20:16:12 +00:00
Tenghui Zhu
1c7fbe0efb Merge "When the incoming light source is invalid, don\'t generate any shadow" into mnc-dr-dev 
am: 76d20b4a5c

* commit '76d20b4a5c6463235d9497b8018a38c059a6761c':
  When the incoming light source is invalid, don't generate any shadow
 2015-11-05 20:13:05 +00:00
Joe LaPenna
efcb281bec Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE 
am: 88c7c3e080  -s ours

* commit '88c7c3e08051f4a2be8ee5194214678a07ff7f01':
  Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE
 2015-11-05 20:09:17 +00:00
Baligh Uddin
42facf05ce Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 69cc50f1e8  -s ours

* commit '69cc50f1e881b80db9767ce7535fe58067ca4222':
  Import translations. DO NOT MERGE
 2015-11-05 20:07:40 +00:00