52871 Commits

Author SHA1 Message Date
Robin Lee
6d3912e2ef Merge "Revert "Publish DevicePolicyManager CA certificate APIs"" 2014-06-17 21:55:55 +00:00
Robin Lee
2b5e917026 Revert "Publish DevicePolicyManager CA certificate APIs"
This reverts commit 5260bf69946563dc47c17e7441b352adfce384c5.

Change-Id: I5e44fdac8a7375576b25171f58e31a1fa0e3c569
2014-06-17 22:12:28 +00:00
Alan Viverette
1f681448c6 Merge "Add attributes and accessors for tinting View drawables" 2014-06-17 20:42:58 +00:00
Alan Viverette
911743652b Add attributes and accessors for tinting View drawables
Also cleans up handling in setters for managed drawables.

BUG: 15391544
Change-Id: Idc08f7eaea0050feb6403566985a6d58185b81f8
2014-06-17 14:51:45 -07:00
John Reck
b65f0d5f08 Merge "Fix setLayerType" 2014-06-17 21:13:21 +00:00
John Reck
ca0608af3c Fix setLayerType
Bug: 15682142

 mLayerType/getLayerType() can modify the display list, so invalidate()
 is necessary

Change-Id: I1d323c1bd4356b31159b51d4299de099e53a0389
2014-06-17 14:39:15 -07:00
Christopher Tate
5b2034e2cc Merge "Switch everything to scheduled jobs" 2014-06-17 20:55:27 +00:00
Christopher Tate
564054146e Merge "Tweak restore API" 2014-06-17 20:55:27 +00:00
Christopher Tate
6a49dd087f Tweak restore API
We need the transport to tell the system not only what package it's going
to deliver data for next, but also what format that data is in.

Change-Id: I989cf78febf923a4208acb33ed80ccc7869356f5
2014-06-17 14:29:09 -07:00
Brian Attwell
9cf22309e0 Merge "Remove FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET" 2014-06-17 20:49:29 +00:00
Brian Attwell
2aa1549f4d Remove FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET
Reasons

1) Now that QC is no longer a modal dialog, it doesn't make sense for
to use FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET. We want QC to stick around
inside the back stack.

2) FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET is deprecated. It now behaves
completely differently than it used to. It now acts the same as
FLAG_ACTIVITY_NEW_DOCUMENT.

Bug: 15693551
Change-Id: Ia22fe04d7a91876061498bf1f098755b54199704
2014-06-17 21:25:06 +00:00
Jim Miller
cd589baba9 Merge "First pass at FingerprintService integration with HAL. Move FingerprintService to framework services directory Fix merge conflicts." 2014-06-17 21:07:42 +00:00
Jim Miller
a7596147b4 First pass at FingerprintService integration with HAL.
Move FingerprintService to framework services directory
Fix merge conflicts.

Tested: scanning, enrolling, removing.

Change-Id: I58b2b902cb671dc82cdaa54a195ba5f1a154622c
2014-06-17 14:03:37 -07:00
Chris Craik
96401d9995 Merge "Added primitive parameters to various functions requiring rectangles." 2014-06-17 20:42:58 +00:00
Chris Craik
75af3f3c96 Merge "Add abort logging for huge scales and tessellation recursion depth" 2014-06-17 20:49:29 +00:00
Antonio Calabrese
2460958133 Added primitive parameters to various functions requiring rectangles.
Change-Id: I5a2678fa989f0ff34404b8236787a8153b05f113

bug:14322352
2014-06-17 20:17:59 +00:00
Chris Craik
fe02b4b344 Add abort logging for huge scales and tessellation recursion depth
bug:15615144
Change-Id: I275732eb97f9d5179beed23eecd2ee3cc7112e10
2014-06-17 12:23:29 -07:00
Christopher Tate
cf1a2f73fc Switch everything to scheduled jobs
Everything that used the IdleMaintenance APIs/broadcasts gets to use the
spiffy new JobScheduler instead.  Hooray!

On top of that, the now-obsolete "idle maintenance" APIs are now gone
entirely.  Double hooray!

Bug 14993295

Change-Id: I5fb67c296ca8cd0ba8a2c8760a0f0d9d962d813b
2014-06-17 12:14:45 -07:00
Richard Coles
2995606963 Merge "Connect WebView Async Cookie APIs" 2014-06-17 05:13:46 +00:00
Hector Dearman
24a11d311c Connect WebView Async Cookie APIs
Bug: 14379829
Change-Id: I6b0e0644153a805eccb48d30b0ad3e91babd8093
2014-06-17 15:32:07 +01:00
George Mount
4d994261e9 Fix NPE when shared elements are empty.
Bug 15608384

Change-Id: Id7ae383873d8d09b51d9c680942076a3a8ffea5b
2014-06-17 20:45:31 +00:00
George Mount
d4c3c91dd0 Allow antroid.transition Transitions in fragments.
Bug 15274281
Bug 15189829

Change-Id: I8e2974430b84a611866fe20afe1f5745e803683f
2014-06-17 20:24:16 +00:00
Baligh Uddin
f67ce362cf Merge "Import translations. DO NOT MERGE" 2014-06-17 05:00:50 +00:00
Anish Athalye
a4649d95fe Merge "Implement Paint.breakText() using Minikin" 2014-06-17 04:50:03 +00:00
Robert Ly
31f8d22ec5 am 1d3f9b72: am 0bfee5a4: Merge "fix javadocs b/14414251" into klp-modular-dev
* commit '1d3f9b72505cdf72889f9f1984005097ed35d314':
  fix javadocs b/14414251
2014-06-17 19:31:43 +00:00
Robert Ly
1d3f9b7250 am 0bfee5a4: Merge "fix javadocs b/14414251" into klp-modular-dev
* commit '0bfee5a4905a14a318731661214558792abc2f7d':
  fix javadocs b/14414251
2014-06-17 19:26:48 +00:00
Griff Hazen
6762a3351c am 831ca9d3: Document best practices for display intent activities.
* commit '831ca9d3bc73e37f555f6c07babde270f83044fe':
  Document best practices for display intent activities.
2014-06-17 16:20:30 +00:00
Griff Hazen
831ca9d3bc Document best practices for display intent activities.
Bug: 15412926

Change-Id: I1c3082dfde85cd03ffc97be6383a0608f925edcf
2014-06-17 00:38:38 -07:00
George Mount
13ccb79b34 Fix when allowExitOverlap is true to start entering as soon as possible
Bug 15474908

Change-Id: I6d2e8f940c9ed8427183b58a712c244c9940d535
2014-06-17 17:59:54 +00:00
George Mount
b963e13913 Merge "Better coordination of transition destination." 2014-06-17 04:50:03 +00:00
George Mount
67d924341a Better coordination of transition destination.
Bug 15470128
Bug 15470558

Wait for shared element destinations to be complete
before sending it to the calling activity.

Don't allow layout between setting final destination
and the transition values capture.

Use snapshots to hold the final position while waiting
for the called Activity to take the shared element.

Fixed problem with exiting views sometimes disappearing
when exiting.

Change-Id: Ibc655f7bb9e8dd6e8a15778c96931e3d845cc15c
2014-06-17 10:26:50 -07:00
Griff Hazen
ea54579b54 am 6762a335: am 831ca9d3: Document best practices for display intent activities.
* commit '6762a3351ce84ec31ce7cd54c952ddb65a108958':
  Document best practices for display intent activities.
2014-06-17 16:25:10 +00:00
Alex Klyubin
fd445e0336 Merge "Add PSKKeyManager to enable the use of TLS-PSK." 2014-06-17 04:56:28 +00:00
Robin Lee
b12f1778d6 Merge "Publish DevicePolicyManager CA certificate APIs" 2014-06-17 05:12:50 +00:00
John Reck
9d7ee60e5e Remove incorrect isEnabled() check
Bug: 15683945

 invokeFunctor() does not require isEnabled() to be true
 to execute. Specifically it does not care if HardwareRenderer
 has a Surface or not, as it will fall back to a pbuffer surface
 if available. If there is no context at all, it will invoke
 with kModeProcessNoContext.

Change-Id: Ie6abe566b92c8fa33bb7a673fc3b9fa9ce913446
2014-06-17 09:01:33 -07:00
Lorenzo Colitti
b86f752a24 Merge "Notify network observers of route changes." 2014-06-17 04:04:28 +00:00
Lorenzo Colitti
8c0d4594c3 Merge "Move netlink updates to a new NetlinkTracker class." 2014-06-17 04:04:28 +00:00
Lorenzo Colitti
3ee63c25e4 Merge "Modify LinkProperties add/remove route functions." 2014-06-17 04:00:08 +00:00
Lorenzo Colitti
0f50bbfe45 Merge "IpPrefix improvements." 2014-06-17 04:11:04 +00:00
Robert Ly
0bfee5a490 Merge "fix javadocs b/14414251" into klp-modular-dev 2014-06-17 03:35:51 +00:00
Lorenzo Colitti
c18cbfdf8d Notify network observers of route changes.
Bug: 9180552
Change-Id: If8432bc74335676320b815784b21f404d3479c35
2014-06-17 11:18:54 +09:00
Lorenzo Colitti
10accbb46e Move netlink updates to a new NetlinkTracker class.
This will allow us to use this logic on other link types such as
Ethernet, and will also avoid increasing the complexity of
WifiStateMachine as we get more information such as routes and
DNS servers from netlink.

Bug: 9180552
Change-Id: I79034827cb0c5f24d783d7243e04b69e12aa3cc6
2014-06-17 11:18:53 +09:00
Lorenzo Colitti
c17a1b9ee4 Modify LinkProperties add/remove route functions.
This will allow us to dynamically track routes being added and
removed, similar to what we do for IP addresses.

1. Support removing routes. Since this is a new function, we
   don't need to jump through hoops to support callers passing
   in routes that have no interface, we just fail to match them.
2. Make the addRoute method return a boolean value indicating
   whether anything changed. This is consistent with what we do
   for addresses and is used to decide whether to update the
   rest of the system when an update comes in.

Bug: 9180552
Change-Id: I50648b5f81ec55c88501a7640e119cda2bb540f2
2014-06-17 11:18:53 +09:00
Lorenzo Colitti
8c6c2c3c92 IpPrefix improvements.
1. Allow IpPrefixes to be created from strings. In order to do
   this, factor out the code from LinkAddress which already does
   this to a small utility class in NetworkUtils.
2. Truncate prefixes on creation, fixing a TODO.
3. Add a toString method.
4. Write a unit test.

While I'm at it, make RouteInfoTest pass again, and convert it
to use IpPrefix instead of LinkAddress.

Change-Id: I5f68f8af8f4aedb25afaee00e05369f01e82a70b
2014-06-17 11:18:53 +09:00
Adam Lesinski
e75b2c2677 Fix runtime overlay tests
The runtime overlay tests were crafting bad locales.

Change-Id: I33c87e71752756f40a954db9f01ea3cdde488a42
2014-06-17 01:22:57 +00:00
Anish Athalye
a7aa1b0aa5 Implement Paint.breakText() using Minikin
Change-Id: I36cee2d840ce1bd24a9a06f0c680880396b7398a
2014-06-17 00:31:19 +00:00
Adam Lesinski
2c749d2427 New command to get device config
Change-Id: I7172a3a150fd83e2382ca3e4e4a0188758189f14
2014-06-16 23:01:19 +00:00
John Reck
b69fc08303 Merge "Add atlas map pointer validation" 2014-06-16 22:12:26 +00:00
John Reck
b8802b1293 Add atlas map pointer validation
Bug: 15425820

 This just prevents the crash, it's still unclear how bad pointers
 are getting into the map in the first place

Change-Id: I3acffaae09548ec48973035b7fcf5f35606bad60
2014-06-16 15:28:50 -07:00
Raph Levien
466cd7a2a6 Merge "Clean up dirFlags / bidiFlags confusion" 2014-06-16 22:12:26 +00:00