Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
175,340 Commits 3 Branches 0 Tags
2706cb804a4e2d52b671a560f65108cf2ebbcd6d
Commit Graph

48102 Commits

Author SHA1 Message Date
Dianne Hackborn
5bbb1af74a Merge "Work on issue #18486438: Reduce size of bugreport output" into lmp-mr1-dev 2014-11-24 17:53:50 +00:00
Jeff Brown
8cac73097e am b5686d55: am 3d110b23: Make WallpaperService watch the actual display state. 
* commit 'b5686d55963e76c801ca0581a1012c5f4aa8d009':
  Make WallpaperService watch the actual display state.
 2014-11-24 17:40:02 +00:00
Jeff Brown
b5686d5596 am 3d110b23: Make WallpaperService watch the actual display state. 
* commit '3d110b239153a6c7423a99f02ef859201205eee2':
  Make WallpaperService watch the actual display state.
 2014-11-24 17:34:32 +00:00
Sreeram Ramachandran
608ea32286 am 6d0e8711: Merge "Delete unused/non-working code." into lmp-mr1-dev 
* commit '6d0e8711d0612cfc9d9db2def57541076c0f7a40':
  Delete unused/non-working code.
 2014-11-24 17:28:14 +00:00
Sreeram Ramachandran
4096a3107b am 45e27327: Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev 
* commit '45e27327178be9d5524cfcbdde9bb83502668e46':
  Allow VPNs to specify their underlying networks.
 2014-11-24 17:28:09 +00:00
Sreeram Ramachandran
6d0e8711d0 Merge "Delete unused/non-working code." into lmp-mr1-dev 2014-11-24 17:24:26 +00:00
Sreeram Ramachandran
45e2732717 Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev 2014-11-24 17:24:04 +00:00
Sreeram Ramachandran
1d16570b37 am aaea7e81: Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev 
* commit 'aaea7e81141f4feb6cf5804b815567247b9c1f3a':
  Eliminate race conditions in UID-based network filtering.
 2014-11-24 17:23:52 +00:00
Sreeram Ramachandran
aaea7e8114 Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev 2014-11-24 17:21:18 +00:00
Narayan Kamath
98c6029878 am 97ee3f7c: resolved conflicts for merge of 98b8fe74 to lmp-mr1-dev-plus-aosp 
* commit '97ee3f7ca6ca3959f4fff4d264921c1c4e379bba':
  Stop using DATE_FORMAT from settings.
 2014-11-24 16:39:35 +00:00
Narayan Kamath
97ee3f7ca6 resolved conflicts for merge of 98b8fe74 to lmp-mr1-dev-plus-aosp 
Change-Id: Ic2826f3be8337e72a80978e4565e0884b9ceed70
 2014-11-24 16:32:06 +00:00
Narayan Kamath
65af39f57e am 43395d67: am 68e9af7b: am 1d84709c: Merge "Stop reading Settings.System.DATE_FORMAT." 
* commit '43395d677b431def5e6d8707297d590ba8f204a1':
  Stop reading Settings.System.DATE_FORMAT.
 2014-11-24 16:23:59 +00:00
Narayan Kamath
43395d677b am 68e9af7b: am 1d84709c: Merge "Stop reading Settings.System.DATE_FORMAT." 
* commit '68e9af7ba0b846768036f268d719f3d2a333ffca':
  Stop reading Settings.System.DATE_FORMAT.
 2014-11-24 16:19:04 +00:00
Narayan Kamath
32ed090f5a Merge "Stop using DATE_FORMAT from settings." 2014-11-24 16:14:33 +00:00
Narayan Kamath
f91f06a599 Stop reading Settings.System.DATE_FORMAT. 
Also, move over DateFormat.getInstance(SHORT) instead of
LocaleData.shortDateFormat4 (which forces 4 digit years).
Based on an analysis of git history, there seems to be no
real motiviation for using 4 digit years.

If anyone in the platform complains loudly, we could look at
using a skeleton pattern instead of just replacing 'y' with 'yy'.

If third party apps are affected, we could add a targetSdkversion
based check and revert to the old behaviour for older targetSdks.

bug: 18388178
bug: 18322220
Change-Id: Ieab2b41691958a2e668d382c5a6b3d9aaf741ed2
 2014-11-24 16:05:19 +00:00
Adrian Roos
520d20c1a8 am 702d9e31: Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev 
* commit '702d9e31b1bcacff975a2b8e0d04160bbd6811ed':
  Fix DPM.resetPassword("")
 2014-11-24 16:04:13 +00:00
Christoph Studer
30646d87f2 am 67142495: Merge "Fix MediaStyle API comments" into lmp-mr1-dev 
* commit '671424951dcd2a0d1059c6d899a8649cbc8b5e26':
  Fix MediaStyle API comments
 2014-11-24 16:04:08 +00:00
Adrian Roos
702d9e31b1 Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev 2014-11-24 16:02:11 +00:00
Christoph Studer
671424951d Merge "Fix MediaStyle API comments" into lmp-mr1-dev 2014-11-24 16:00:38 +00:00
Christoph Studer
e935fe918e Fix MediaStyle API comments 
Bug: 17805819
Change-Id: Ie45a43d7ae99304d635ce75aeb32a6d4d4e3e57d
 2014-11-24 14:18:06 +01:00
Selim Cinek
f0fc23a141 am 962b06f9: Merge "Fixed several time related states for secondary users" into lmp-mr1-dev 
* commit '962b06f9a02f08392b6f87225a314ebf39dd7a07':
  Fixed several time related states for secondary users
 2014-11-24 11:57:59 +00:00
Selim Cinek
962b06f9a0 Merge "Fixed several time related states for secondary users" into lmp-mr1-dev 2014-11-24 11:52:40 +00:00
Robin Lee
0d5ccb7378 Ensure that private key is PKCS#8-encoded 
getEncoded() is not requred to return a PKCS#8-encoded result.

Bug: 15065444
Change-Id: I1278ff9ffffe5887f149bae9288a174beed5f86a
 2014-11-24 10:10:39 +00:00
Wink Saville
4f1cce6306 am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
* commit '12c2136e556b54a717624d8479ec4650f363ce45':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-22 20:28:10 +00:00
Wink Saville
12c2136e55 Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 2014-11-22 20:19:25 +00:00
Wink Saville
d09c4cad65 Additional changes to SubscriptionManager API as per API council. 
bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
 2014-11-22 10:08:16 -08:00
Eino-Ville Talvala
e289082a70 am dfa99f63: Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev 
* commit 'dfa99f63677c238453293f48b62b4fffcc101262':
  Camera: Add new capability flags as system features as well
 2014-11-22 05:00:48 +00:00
Eino-Ville Talvala
dfa99f6367 Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev 2014-11-22 04:57:49 +00:00
Jeff Brown
3d110b2391 Make WallpaperService watch the actual display state. 
Bug: 18471411
Change-Id: Ie9d2e70e4e105dfbb2cb4d9726f632bcf2cc0a31
 2014-11-22 03:25:39 +00:00
John Reck
82cb15199a am cbee971a: resolved conflicts for merge of 08372601 to lmp-mr1-dev-plus-aosp 
* commit 'cbee971a105adcf071b89838818f31b37388e9b9':
  It's super critical to call nStart
 2014-11-22 01:14:12 +00:00
John Reck
cbee971a10 resolved conflicts for merge of 08372601 to lmp-mr1-dev-plus-aosp 
Change-Id: I86b78ada4f30c23ae1232ac5a509986d5b8dc546
 2014-11-21 17:07:17 -08:00
Amith Yamasani
9d4e6a8355 am 1f26bf6b: am 108bdbc9: am efb2df69: Merge "Different messages when wiping user and not device" into lmp-mr1-dev 
* commit '1f26bf6bfd683b840f688b41d285fd9c942e6ed5':
  Different messages when wiping user and not device
 2014-11-22 00:00:01 +00:00
John Reck
08372601ab am 418c8549: Merge "It\'s super critical to call nStart" into lmp-mr1-dev 
* commit '418c8549dca8bff8c38c67ed7f7d7fbbaccd4e71':
  It's super critical to call nStart
 2014-11-21 23:37:52 +00:00
John Reck
418c8549dc Merge "It's super critical to call nStart" into lmp-mr1-dev 2014-11-21 23:32:08 +00:00
Dianne Hackborn
d052a9416a Work on issue #18486438: Reduce size of bugreport output 
Reduce how much stuff ProcessStats spews, and do collapsing of
repeated intent filter targets when dumping IntentResolvers.

Also add to pm's checkout output to include shared user ids,
and fix output formatting in a few places.

Change-Id: Ic9fc6731f0439101ba9343535e66cdbbad47e291
 2014-11-21 15:23:13 -08:00
Jeff Sharkey
fa6547f6c0 am 79ef5ef7: am 54c11274: am c0491a2e: Merge "Lightweight checkin output for network stats." into lmp-mr1-dev 
* commit '79ef5ef7a58baf17f7c3522a5aeb041f5206c32a':
  Lightweight checkin output for network stats.
 2014-11-21 23:14:12 +00:00
Jeff Brown
fd72097736 am 4c9041cf: am 1ac13e02: am 682ed6b6: Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev 
* commit '4c9041cf837cda13c749b148661d18c3fab0fbd6':
  Support keeping activities resumed while dozing.
 2014-11-21 23:13:49 +00:00
Yigit Boyar
244b5d01e3 am f532871e: am 1bbaeaa4: am ace33655: Merge "Improve GridLayout\'s weight calculations" into lmp-mr1-dev 
* commit 'f532871ec4cecd63e760706fbb8871bc1c65583b':
  Improve GridLayout's weight calculations
 2014-11-21 23:13:16 +00:00
Alan Viverette
72807b2363 am d7c5acdf: am e606a788: am 0218970a: Merge "Fix error overwriting when restoring error" 
* commit 'd7c5acdf1c98bb92ab05a524375e602296a24422':
  Fix error overwriting when restoring error
 2014-11-21 23:13:08 +00:00
Alan Viverette
80bf12f74a am 47379f30: am e442e904: am 47172f53: Merge "Use parseColor instead of getHTMLColor" 
* commit '47379f3050265453655ff82edd4c36bda01ba48f':
  Use parseColor instead of getHTMLColor
 2014-11-21 23:13:03 +00:00
Amith Yamasani
1f26bf6bfd am 108bdbc9: am efb2df69: Merge "Different messages when wiping user and not device" into lmp-mr1-dev 
* commit '108bdbc934d1e5fb77406d0267ab67f8736dfc57':
  Different messages when wiping user and not device
 2014-11-21 23:07:03 +00:00
Amith Yamasani
108bdbc934 am efb2df69: Merge "Different messages when wiping user and not device" into lmp-mr1-dev 
* commit 'efb2df698a4c2ed3d3371656cab199e5e3737fa9':
  Different messages when wiping user and not device
 2014-11-21 23:00:52 +00:00
Bryce Lee
2388c814a0 am 296ea917: am deee5566: am d45cedd6: Merge "Make default windows features configurable." into lmp-mr1-dev 
* commit '296ea9174222e64085a66a238e6df13b8b378b1e':
  Make default windows features configurable.
 2014-11-21 22:33:01 +00:00
John Reck
72d6e4facb It's super critical to call nStart 
Bug: 18204974

Even if we are canceling or ending an animation
nStart() *must* be called, otherwise the native-side listener
is not attached (lazy-attached for JNI cyclic reference reasons),
and then Animator::callOnFinishedListener() no-ops as there's
no listener set

Add a lifecycle verifier to ensure that nStart is always
called on animators that are attached and get finished

Change-Id: Ibc345b5be97b6d3f95a11c361ebe020d030fd3b6
 2014-11-21 14:27:21 -08:00
Amith Yamasani
efb2df698a Merge "Different messages when wiping user and not device" into lmp-mr1-dev 2014-11-21 22:27:17 +00:00
Chris Craik
90102e1009 am 1ae8a98e: am 29dc496a: Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev 
* commit '1ae8a98e8a6ba82396955c0b6ab0e02568a3494b':
  Revert "Add a way to override Xfermode DO NOT MERGE"
 2014-11-21 22:21:02 +00:00
Chris Craik
1ae8a98e8a am 29dc496a: Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev 
* commit '29dc496a42d49a37dcd99c0465f3cec18a47e6ff':
  Revert "Add a way to override Xfermode DO NOT MERGE"
 2014-11-21 22:13:30 +00:00
Chris Craik
6bcf223bf6 Merge "Revert "Add a way to override Xfermode"" 2014-11-21 22:11:14 +00:00
Chris Craik
29dc496a42 Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev 2014-11-21 22:11:13 +00:00
Jeff Sharkey
79ef5ef7a5 am 54c11274: am c0491a2e: Merge "Lightweight checkin output for network stats." into lmp-mr1-dev 
* commit '54c11274b5e7ce9f774f7c846d7165563279b96a':
  Lightweight checkin output for network stats.
 2014-11-21 22:09:28 +00:00