OSDN Git Service

android-x86/frameworks-base.git
10 years agoCatch ActivityNotFoundException in quick contacts badge
Yorke Lee [Sat, 7 Dec 2013 00:35:29 +0000 (16:35 -0800)]
Catch ActivityNotFoundException in quick contacts badge

Bug: 12015287
Change-Id: I2fa5daaa54cc7cc0cad9dee0828d751302cb5be7

10 years agoam bf88b659: am 5fa89d55: am 6b8a3a52: am f7422885: Merge "Augment SELinuxMMAC functi...
Nick Kralevich [Fri, 6 Dec 2013 16:26:08 +0000 (16:26 +0000)]
am bf88b659: am 5fa89d55: am 6b8a3a52: am f7422885: Merge "Augment SELinuxMMAC functionality."

* commit 'bf88b659b6c02143b464c0551d4875f7911ed269':
  Augment SELinuxMMAC functionality.

10 years agoam 5fa89d55: am 6b8a3a52: am f7422885: Merge "Augment SELinuxMMAC functionality."
Nick Kralevich [Fri, 6 Dec 2013 16:22:58 +0000 (16:22 +0000)]
am 5fa89d55: am 6b8a3a52: am f7422885: Merge "Augment SELinuxMMAC functionality."

* commit '5fa89d55712110c2932f76357216e7a77b3b317e':
  Augment SELinuxMMAC functionality.

10 years agoam 6b8a3a52: am f7422885: Merge "Augment SELinuxMMAC functionality."
Nick Kralevich [Fri, 6 Dec 2013 16:20:18 +0000 (08:20 -0800)]
am 6b8a3a52: am f7422885: Merge "Augment SELinuxMMAC functionality."

* commit '6b8a3a52acf1c2722551f1ea1ce47831f87939cd':
  Augment SELinuxMMAC functionality.

10 years agoam f7422885: Merge "Augment SELinuxMMAC functionality."
Nick Kralevich [Fri, 6 Dec 2013 16:17:23 +0000 (08:17 -0800)]
am f7422885: Merge "Augment SELinuxMMAC functionality."

* commit 'f7422885a99c5d240f70c2f8227ae44abeea3e5c':
  Augment SELinuxMMAC functionality.

10 years agoMerge "Augment SELinuxMMAC functionality."
Nick Kralevich [Fri, 6 Dec 2013 16:13:58 +0000 (16:13 +0000)]
Merge "Augment SELinuxMMAC functionality."

10 years agoAugment SELinuxMMAC functionality.
Robert Craig [Mon, 2 Dec 2013 15:24:23 +0000 (10:24 -0500)]
Augment SELinuxMMAC functionality.

* No longer support a package name stanza outside of
  a signature tag. Package names, by themselves, have
  no security associated with them in Android and thus we
  should not be allowing or encouraging this
  type of policy.

* Allow for nested package name stanzas inside
  signature stanzas. There are cases where a finer
  distinction needs to be made among apps signed with
  the same cert. New code allows a different seinfo
  tag to be assigned to the listed package names
  signed by the parent cert. When a determination needs
  to be made concerning seinfo assignments, the inner
  seinfo tag takes precedence over the outer seinfo
  labels which are assigned to just the signature.

* Temp structures are now used to parse new policy files
  until the entire xml file is parsed and deemed correct,
  at which time the temp structures are copied over to the
  permanent class structures. This ensures that any structural
  errors with the policy will not result in partial loads.

* Valid stanzas look like the following with the inner
  package piece being optional.

   <signer signature="">
     <seinfo value=""/>
     <package name="">
       <seinfo value=""/>
     </package>
   <signer>

   <default>
     <seinfo value=""/>
   </default>

Change-Id: Ia204d71211776dcf9b2dcc86ad6d77c4ad39dc25

10 years agoam dcff5cef: am d7a5aaee: am ebcb32f5: Merge commit \'bac61807d3bcfff957b358cb9ad7785...
The Android Open Source Project [Fri, 6 Dec 2013 02:50:46 +0000 (02:50 +0000)]
am dcff5cef: am d7a5aaee: am ebcb32f5: Merge commit \'bac61807d3bcfff957b358cb9ad77850bd373689\' into HEAD

* commit 'dcff5ceff6ef0050af4c49a8c2a86ab663a88665':

10 years agoam d7a5aaee: am ebcb32f5: Merge commit \'bac61807d3bcfff957b358cb9ad77850bd373689...
The Android Open Source Project [Fri, 6 Dec 2013 01:43:38 +0000 (01:43 +0000)]
am d7a5aaee: am ebcb32f5: Merge commit \'bac61807d3bcfff957b358cb9ad77850bd373689\' into HEAD

* commit 'd7a5aaee145879804006d2c00daa4c14d544e03a':

10 years agoam ebcb32f5: Merge commit \'bac61807d3bcfff957b358cb9ad77850bd373689\' into HEAD
The Android Open Source Project [Fri, 6 Dec 2013 01:27:10 +0000 (17:27 -0800)]
am ebcb32f5: Merge commit \'bac61807d3bcfff957b358cb9ad77850bd373689\' into HEAD

* commit 'ebcb32f58a6220802ca129ea33f47b4b69931a10':

10 years agoMerge "Fix typo in LayerDrawable"
Alan Viverette [Thu, 5 Dec 2013 23:35:48 +0000 (23:35 +0000)]
Merge "Fix typo in LayerDrawable"

10 years agoFix typo in LayerDrawable
Alan Viverette [Thu, 5 Dec 2013 23:34:28 +0000 (15:34 -0800)]
Fix typo in LayerDrawable

Change-Id: I6c73cb90d0c161d29e8d41c54850d66840c947d7

10 years agoam d22f6a62: (-s ours) am 61c9706b: (-s ours) am 43e56c4a: (-s ours) Merge "Import...
Baligh Uddin [Thu, 5 Dec 2013 22:51:20 +0000 (22:51 +0000)]
am d22f6a62: (-s ours) am 61c9706b: (-s ours) am 43e56c4a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'd22f6a6296b0fc7dee08bc442a54343c1b478a4c':

10 years agoam 4830bc50: (-s ours) am dc5f592c: (-s ours) am 78f5ef71: (-s ours) Merge "Import...
Baligh Uddin [Thu, 5 Dec 2013 22:51:15 +0000 (22:51 +0000)]
am 4830bc50: (-s ours) am dc5f592c: (-s ours) am 78f5ef71: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '4830bc50848e3c575e74ef9c996821af45943cf7':

10 years agoam 335289aa: (-s ours) am 51843f8a: am 371c46fe: Merge "Remove exceptions from the...
Svetoslav Ganov [Thu, 5 Dec 2013 22:51:10 +0000 (22:51 +0000)]
am 335289aa: (-s ours) am 51843f8a: am 371c46fe: Merge "Remove exceptions from the printer discovery session APIs." into klp-dev

* commit '335289aae79b5dc759629a89b97bf059a3d1e466':

10 years agoam 758485f0: (-s ours) am 0d27bc29: am 56e0d6b8: Merge "Allow configuration of Toast...
Jose Lima [Thu, 5 Dec 2013 22:51:05 +0000 (22:51 +0000)]
am 758485f0: (-s ours) am 0d27bc29: am 56e0d6b8: Merge "Allow configuration of Toast gravity settings" into klp-dev

* commit '758485f003844b9426a6883f43f7354c3f8a4bfd':

10 years agoam e4fdda27: (-s ours) am 8810a0c3: am 69b9eff1: Merge "Update Quick Settings to...
David Christie [Thu, 5 Dec 2013 22:50:58 +0000 (22:50 +0000)]
am e4fdda27: (-s ours) am 8810a0c3: am 69b9eff1: Merge "Update Quick Settings to use new consolidated master location method. This is an effort to consolidate the logic of what the "master location switch" means.  Quick settings will no longeer explicitly enable/disable gps and

* commit 'e4fdda2793bd1bd44259ae685d76ac4323a4de5e':

10 years agoam 44e0da4e: (-s ours) am c319ddd9: am 4c737496: Merge "Change the exception msg...
Kristian Monsen [Thu, 5 Dec 2013 22:50:53 +0000 (22:50 +0000)]
am 44e0da4e: (-s ours) am c319ddd9: am 4c737496: Merge "Change the exception msg" into klp-dev

* commit '44e0da4ebc2107d1bf92465bf9a1245da874ef0c':

10 years agoam ba690f48: (-s ours) am f76c1685: am 049cbd64: Merge "Fix a bug in single socket...
Vinit Deshapnde [Thu, 5 Dec 2013 22:50:48 +0000 (22:50 +0000)]
am ba690f48: (-s ours) am f76c1685: am 049cbd64: Merge "Fix a bug in single socket connection to Wifi Supplicant" into klp-dev

* commit 'ba690f48b95010f096c4df04b5fec91bf6bf73c7':

10 years agoam 44894df5: (-s ours) am 72d29c2d: am ddbfdfa5: Merge "fix race condition when a...
keunyoung [Thu, 5 Dec 2013 22:50:43 +0000 (22:50 +0000)]
am 44894df5: (-s ours) am 72d29c2d: am ddbfdfa5: Merge "fix race condition when a new display is added" into klp-dev

* commit '44894df5d79500ade82cc8f250cc8fe70b28af87':

10 years agoam 054a7f5c: (-s ours) am aad62128: am 51b4a40e: Merge "Expose vendor and product...
Michael Wright [Thu, 5 Dec 2013 22:50:37 +0000 (22:50 +0000)]
am 054a7f5c: (-s ours) am aad62128: am 51b4a40e: Merge "Expose vendor and product IDs for InputDevices" into klp-dev

* commit '054a7f5cba275b929c60b17128c13026cbdcd154':

10 years agoam 5126f194: (-s ours) am 4b982e49: am ebec4b6e: Merge "fix kBW_Format glyphs" into...
Victoria Lease [Thu, 5 Dec 2013 22:50:31 +0000 (22:50 +0000)]
am 5126f194: (-s ours) am 4b982e49: am ebec4b6e: Merge "fix kBW_Format glyphs" into klp-dev

* commit '5126f194c08dcb230a74c5be1ceaf094d92f759e':

10 years agoam 1668ebf4: (-s ours) am 76bf4d6d: am d1f6b624: Merge "Take text alignment into...
Romain Guy [Thu, 5 Dec 2013 22:50:26 +0000 (22:50 +0000)]
am 1668ebf4: (-s ours) am 76bf4d6d: am d1f6b624: Merge "Take text alignment into account to compue text bounds Bug #10258621" into klp-dev

* commit '1668ebf484d194156d12e2fb791bea39e7742074':

10 years agoam f5a89a2b: (-s ours) am 1e68ffc7: am 890db42b: Merge "Not create context menu when...
Alan Viverette [Thu, 5 Dec 2013 22:50:20 +0000 (22:50 +0000)]
am f5a89a2b: (-s ours) am 1e68ffc7: am 890db42b: Merge "Not create context menu when mouse right click outside list/grid items" into klp-dev

* commit 'f5a89a2bb3fa4c48787d5c8c5f6fdec5005c0456':

10 years agoam ae2b3981: (-s ours) am beb7b449: am b9b1701d: Merge "Make PrintFileDocumentAdapter...
Svetoslav [Thu, 5 Dec 2013 22:50:14 +0000 (22:50 +0000)]
am ae2b3981: (-s ours) am beb7b449: am b9b1701d: Merge "Make PrintFileDocumentAdapter non-final." into klp-dev

* commit 'ae2b398150a2ed66866aef2c3781020e1ca9f059':

10 years agoam a004f72c: (-s ours) am 54276ad3: am cd89feb9: Merge "pause/resume for Animators...
Chet Haase [Thu, 5 Dec 2013 22:44:46 +0000 (22:44 +0000)]
am a004f72c: (-s ours) am 54276ad3: am cd89feb9: Merge "pause/resume for Animators" into klp-dev

* commit 'a004f72cf00555aa2694b97ff6c17b97397cd471':

10 years agoam 7a9ec2cd: (-s ours) am afa1231e: am b6da9115: Merge "Remove incorrect warning...
Craig Mautner [Thu, 5 Dec 2013 22:44:40 +0000 (22:44 +0000)]
am 7a9ec2cd: (-s ours) am afa1231e: am b6da9115: Merge "Remove incorrect warning." into klp-dev

* commit '7a9ec2cd8d00c906603c5cb88625c97b47378947':

10 years agoam 6acc2743: (-s ours) am dfa36da5: am 076d3787: am 6441b9bd: am e5007896: am e78b4f5...
Katie McCormick [Thu, 5 Dec 2013 22:44:35 +0000 (22:44 +0000)]
am 6acc2743: (-s ours) am dfa36da5: am 076d3787: am 6441b9bd: am e5007896: am e78b4f53: Doc change: collapse key fix... clean version of kmccormick\'s change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb

* commit '6acc2743ee24268b1919c4eb25bb1437b0379fec':

10 years agoam aff9c487: (-s ours) am ff1b3f07: am 1232c51e: Merge "Add the API to support webvie...
Selim Gurun [Thu, 5 Dec 2013 22:44:29 +0000 (22:44 +0000)]
am aff9c487: (-s ours) am ff1b3f07: am 1232c51e: Merge "Add the API to support webview printing" into klp-dev

* commit 'aff9c48759619c4025927fec4cdf6d5e274db144':

10 years agoam 9b7bf2ba: (-s ours) am 98e50c50: am 964f2b30: Merge "Update Bitmap.createBitmap...
Romain Guy [Thu, 5 Dec 2013 22:44:23 +0000 (22:44 +0000)]
am 9b7bf2ba: (-s ours) am 98e50c50: am 964f2b30: Merge "Update Bitmap.createBitmap() documentation" into klp-dev

* commit '9b7bf2ba1e9f3017a4edc498f455091935d675ab':

10 years agoam d7889768: (-s ours) am 07b9b3ad: am b45b39a2: am cdf3455c: am 6dd38cc5: Revert...
Scott Main [Thu, 5 Dec 2013 22:44:18 +0000 (22:44 +0000)]
am d7889768: (-s ours) am 07b9b3ad: am b45b39a2: am cdf3455c: am 6dd38cc5: Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i\'ll fix it all later."

* commit 'd7889768b1bbb78e15ddc96575180252f1b4a5cf':

10 years agoam 6fa95b46: (-s ours) am 93e5dc65: am fefff422: am 7466b998: am ebcee197: Revert...
Scott Main [Thu, 5 Dec 2013 22:44:12 +0000 (22:44 +0000)]
am 6fa95b46: (-s ours) am 93e5dc65: am fefff422: am 7466b998: am ebcee197: Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i\'ll fix it all later.

* commit '6fa95b46ec7d2a267aa0b732a460588d7c75efcb':

10 years agoam 2717e4ea: (-s ours) am cee3a2a5: am 8d5f3e31: Manage jclass objects (and most...
Andreas Huber [Thu, 5 Dec 2013 22:44:06 +0000 (22:44 +0000)]
am 2717e4ea: (-s ours) am cee3a2a5: am 8d5f3e31: Manage jclass objects (and most jobjects) in jni code using ScopedLocalRef

* commit '2717e4eabe581d4f461918f78fead736f65667ae':

10 years agoam 1d4ddb05: (-s ours) am f8d747b3: (-s ours) am 9a68f82f: Add super_onDrawVerticalSc...
Martin Kosiba [Thu, 5 Dec 2013 22:44:01 +0000 (22:44 +0000)]
am 1d4ddb05: (-s ours) am f8d747b3: (-s ours) am 9a68f82f: Add super_onDrawVerticalScrollBar to WebView.PrivateAccess. DO NOT MERGE

* commit '1d4ddb05e609b2f04aec16c1a06edad1c2232741':

10 years agoam 231fb187: (-s ours) am 4826434c: am ed735c9a: Add missing cleanspec
Ben Murdoch [Thu, 5 Dec 2013 22:43:56 +0000 (22:43 +0000)]
am 231fb187: (-s ours) am 4826434c: am ed735c9a: Add missing cleanspec

* commit '231fb187f5b29bf0a1d377e18a9b44b15fd86244':

10 years agoam 20861b8f: (-s ours) am 35d525c9: am 998cfa2c: Merge "API to discover granted Uri...
Jeff Sharkey [Thu, 5 Dec 2013 22:43:50 +0000 (22:43 +0000)]
am 20861b8f: (-s ours) am 35d525c9: am 998cfa2c: Merge "API to discover granted Uri permissions." into klp-dev

* commit '20861b8f16015c5e5b89bdc8025cc311aeff6883':

10 years agoam 49ab0f16: (-s ours) am 34412965: am c2f8da87: Merge "Bring along BridgeContext...
Jeff Sharkey [Thu, 5 Dec 2013 22:43:45 +0000 (22:43 +0000)]
am 49ab0f16: (-s ours) am 34412965: am c2f8da87: Merge "Bring along BridgeContext for the ride." into klp-dev

* commit '49ab0f1636833270019b3c1ed733b0a4129f08be':

10 years agoam ccff82ee: (-s ours) am 0c305430: am 436b6ee3: Merge "Catch a few extra users of...
Jeff Sharkey [Thu, 5 Dec 2013 22:43:40 +0000 (22:43 +0000)]
am ccff82ee: (-s ours) am 0c305430: am 436b6ee3: Merge "Catch a few extra users of UserEnvironment." into klp-dev

* commit 'ccff82ee2f3d44088c4e7dd1de7e11de4150b63a':

10 years agoam 134f1e9b: (-s ours) am 1d685ec0: am 6e14b22c: Merge "APIs for multiple external...
Jeff Sharkey [Thu, 5 Dec 2013 22:43:35 +0000 (22:43 +0000)]
am 134f1e9b: (-s ours) am 1d685ec0: am 6e14b22c: Merge "APIs for multiple external storage devices." into klp-dev

* commit '134f1e9bdc0922e6e0a6c14978712736797ff04f':

10 years agoam 892c8f3d: (-s ours) am 09848031: am b8160401: Merge "Fix the build" into klp-dev
Svetoslav Ganov [Thu, 5 Dec 2013 22:43:29 +0000 (22:43 +0000)]
am 892c8f3d: (-s ours) am 09848031: am b8160401: Merge "Fix the build" into klp-dev

* commit '892c8f3d633301b2c6efa5ca38dd375c907612a3':

10 years agoam ee6556ab: (-s ours) am e1c2dfee: am c7c4d6dd: Merge "Refinement of the print servi...
Svetoslav Ganov [Thu, 5 Dec 2013 22:43:24 +0000 (22:43 +0000)]
am ee6556ab: (-s ours) am e1c2dfee: am c7c4d6dd: Merge "Refinement of the print service APIs." into klp-dev

* commit 'ee6556abc93f40955a745b0d2c3329d731c360b4':

10 years agoam 61dce579: (-s ours) am b8029214: am 0dd303cf: Merge "Put animation background...
Craig Mautner [Thu, 5 Dec 2013 22:43:19 +0000 (22:43 +0000)]
am 61dce579: (-s ours) am b8029214: am 0dd303cf: Merge "Put animation background behind visible wallpaper" into klp-dev

* commit '61dce5799a9b037a1ce4d1e723453211391e9237':

10 years agoam 0816267f: (-s ours) am a9f2faa9: am a48ad8bd: PROXY_SERVICE may be missing and...
Wink Saville [Thu, 5 Dec 2013 22:43:14 +0000 (22:43 +0000)]
am 0816267f: (-s ours) am a9f2faa9: am a48ad8bd: PROXY_SERVICE may be missing and its reference null.

* commit '0816267f70c9ef14e31f49ffd9bdf4c38a917f48':

10 years agoam 980ae54d: (-s ours) am 2954c1b9: am 7a7c35e2: am 94c529b8: am 385bb2eb: resolved...
Katie McCormick [Thu, 5 Dec 2013 22:43:08 +0000 (22:43 +0000)]
am 980ae54d: (-s ours) am 2954c1b9: am 7a7c35e2: am 94c529b8: am 385bb2eb: resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev

* commit '980ae54d3c1dec8e5e620b9e471fed98402b888c':

10 years agoam 87251061: (-s ours) am 71716cc5: am 97aaa8f0: Merge "Bluetooth MAP profile - sms...
Zhihai Xu [Thu, 5 Dec 2013 22:43:03 +0000 (22:43 +0000)]
am 87251061: (-s ours) am 71716cc5: am 97aaa8f0: Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev

* commit '8725106123f62cb5057beaba65f3c013b4e5a140':

10 years agoam 5174a7a0: (-s ours) am 1b90bdf2: am f910d320: Merge "Address Robin\'s code review...
destradaa [Thu, 5 Dec 2013 22:42:57 +0000 (22:42 +0000)]
am 5174a7a0: (-s ours) am 1b90bdf2: am f910d320: Merge "Address Robin\'s code review comments in initial FlpHal submission." into klp-dev

* commit '5174a7a05e8b80b9e6fd9420ca781c2fe494bcc0':

10 years agoam 3edd90d4: (-s ours) am 8e4e7a20: am 35786c34: Merge "Allow bound processes to...
Dianne Hackborn [Thu, 5 Dec 2013 22:42:52 +0000 (22:42 +0000)]
am 3edd90d4: (-s ours) am 8e4e7a20: am 35786c34: Merge "Allow bound processes to go PROCESS_STATE_TOP." into klp-dev

* commit '3edd90d47d89332235a260f2b0787789571b2848':

10 years agoam 5d6930fe: (-s ours) am c70629f1: am 583ed765: Merge "Take shadow bounds into accou...
Romain Guy [Thu, 5 Dec 2013 22:42:46 +0000 (22:42 +0000)]
am 5d6930fe: (-s ours) am c70629f1: am 583ed765: Merge "Take shadow bounds into account for quick rejects Bug #8634346" into klp-dev

* commit '5d6930fe4ea0c24f6e1fde4a250cfb941311ed7b':

10 years agoam e6eae160: (-s ours) am 2d1716a8: (-s ours) am 67d5c290: (-s ours) Merge "Import...
Baligh Uddin [Thu, 5 Dec 2013 22:42:40 +0000 (22:42 +0000)]
am e6eae160: (-s ours) am 2d1716a8: (-s ours) am 67d5c290: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'e6eae1609e73205edd560846a032c89dabe9827f':

10 years agoam 1612eac0: (-s ours) am 06c2bad6: am 96aadf83: Merge "Prevent AsyncTask from creati...
Romain Guy [Thu, 5 Dec 2013 22:42:34 +0000 (22:42 +0000)]
am 1612eac0: (-s ours) am 06c2bad6: am 96aadf83: Merge "Prevent AsyncTask from creating too many threads Bug #10228005" into klp-dev

* commit '1612eac06df6ce849cb95935c70ba94093f8d321':

10 years agoam 8c1df1b2: (-s ours) am 4b643f0e: (-s ours) am 40885045: (-s ours) Merge "Import...
Baligh Uddin [Thu, 5 Dec 2013 22:42:28 +0000 (22:42 +0000)]
am 8c1df1b2: (-s ours) am 4b643f0e: (-s ours) am 40885045: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '8c1df1b24a5dd80174a548f30e9da0faf57d5ae9':

10 years agoam a6872c84: (-s ours) am d021b6b1: am b0037316: Merge "More stuff I need for the...
Dianne Hackborn [Thu, 5 Dec 2013 22:42:23 +0000 (22:42 +0000)]
am a6872c84: (-s ours) am d021b6b1: am b0037316: Merge "More stuff I need for the proc stats UI." into klp-dev

* commit 'a6872c84027552661937aad7f4aa109a174eb23f':

10 years agoam fb113bd7: (-s ours) am 17198172: am 2b2d313e: Merge "Reduce amount of invalidation...
Chet Haase [Thu, 5 Dec 2013 22:42:18 +0000 (22:42 +0000)]
am fb113bd7: (-s ours) am 17198172: am 2b2d313e: Merge "Reduce amount of invalidation when old-style animations are running" into klp-dev

* commit 'fb113bd71d22c32c0edc7b3da0afdbe5e38db9e6':

10 years agoam 3ecda672: (-s ours) am c9bf4052: am f6c7a5fd: Merge "add local focus mode and...
keunyoung [Thu, 5 Dec 2013 22:42:13 +0000 (22:42 +0000)]
am 3ecda672: (-s ours) am c9bf4052: am f6c7a5fd: Merge "add local focus mode and input event injection API to Window" into klp-dev

* commit '3ecda6727db8ab035abc18a0e1505faec648c685':

10 years agoam cf5e3137: (-s ours) am f2424907: am 52f8ef21: Merge "Add extra layout pass after...
Craig Mautner [Thu, 5 Dec 2013 22:42:08 +0000 (22:42 +0000)]
am cf5e3137: (-s ours) am f2424907: am 52f8ef21: Merge "Add extra layout pass after draw finished." into klp-dev

* commit 'cf5e3137023edf6360f78161dc704b24e8026c49':

10 years agoam 9cdbcbad: (-s ours) am 00b581de: am dd78a0fb: Merge "parse named anonymous memory...
Colin Cross [Thu, 5 Dec 2013 22:42:01 +0000 (22:42 +0000)]
am 9cdbcbad: (-s ours) am 00b581de: am dd78a0fb: Merge "parse named anonymous memory for dumpsys meminfo" into klp-dev

* commit '9cdbcbadeb56041f4122343cbb2fe5d8026924d5':

10 years agoam e6a7f2c1: (-s ours) am b59dbedc: am 4bcc8ee6: Merge "NFC: always upper-case parsed...
Martijn Coenen [Thu, 5 Dec 2013 22:41:49 +0000 (22:41 +0000)]
am e6a7f2c1: (-s ours) am b59dbedc: am 4bcc8ee6: Merge "NFC: always upper-case parsed AIDs." into klp-dev

* commit 'e6a7f2c197d60849c8ef56b1fb24b30d1fca0d04':

10 years agoam 3b59a334: (-s ours) am bd430b25: am be11c364: Merge "Fix padding adjustment for...
Alan Viverette [Thu, 5 Dec 2013 22:41:43 +0000 (22:41 +0000)]
am 3b59a334: (-s ours) am bd430b25: am be11c364: Merge "Fix padding adjustment for scrollbars in View, FastScroller" into klp-dev

* commit '3b59a3345ea9d4f77a08741572d3ca4533cd216c':

10 years agoam 91e1cb99: (-s ours) am d1715fda: am 9b59e5aa: Merge "Add a name to the DeviceOwner...
Geoffrey Borggaard [Thu, 5 Dec 2013 22:41:37 +0000 (22:41 +0000)]
am 91e1cb99: (-s ours) am d1715fda: am 9b59e5aa: Merge "Add a name to the DeviceOwner" into klp-dev

* commit '91e1cb99a8f32fcd8172f9e2c95c3ff414c0c031':

10 years agoam 9fe98de0: (-s ours) am e4e68219: am 88dced29: Merge "Fix bug #10210182 CTS: androi...
Fabrice Di Meglio [Thu, 5 Dec 2013 22:41:32 +0000 (22:41 +0000)]
am 9fe98de0: (-s ours) am e4e68219: am 88dced29: Merge "Fix bug #10210182 CTS: android.widget.cts.TextViewTest#testDrawableResolution is failing on KLP" into klp-dev

* commit '9fe98de0a9f21c0e190362c9c03563dfb241ba52':

10 years agoam e286c012: (-s ours) am 003b944d: am d81a15c6: Merge "Add method for adding two...
Dianne Hackborn [Thu, 5 Dec 2013 22:41:27 +0000 (22:41 +0000)]
am e286c012: (-s ours) am 003b944d: am d81a15c6: Merge "Add method for adding two ProcessStats objects together." into klp-dev

* commit 'e286c012f2e7a71ae6de97a08dfe170fe9a50cd1':

10 years agoam 6317f13e: (-s ours) am b945d80c: am 5af4edef: Merge "Fix bug #10205316 CTS (KLP...
Fabrice Di Meglio [Thu, 5 Dec 2013 22:41:21 +0000 (22:41 +0000)]
am 6317f13e: (-s ours) am b945d80c: am 5af4edef: Merge "Fix bug #10205316 CTS (KLP): android.graphics tests are failing" into klp-dev

* commit '6317f13e419f0df239de612d29ffda8209c6d6cd':

10 years agoam d7f6aff9: (-s ours) am 795a7dec: am 5adfb21e: am a0b320a6: Merge "Remove possible...
Elliott Hughes [Thu, 5 Dec 2013 22:41:16 +0000 (22:41 +0000)]
am d7f6aff9: (-s ours) am 795a7dec: am 5adfb21e: am a0b320a6: Merge "Remove possible leak when exception occurred."

* commit 'd7f6aff9544a5e1e9f553ee75866eaaf9c3e733d':

10 years agoam 0a128348: (-s ours) am 2464fcdf: am 5893a97c: Merge "fix-up dependencies to gl...
Mathias Agopian [Thu, 5 Dec 2013 22:41:10 +0000 (22:41 +0000)]
am 0a128348: (-s ours) am 2464fcdf: am 5893a97c: Merge "fix-up dependencies to gl headers" into klp-dev

* commit '0a12834894a90c592e20e69e64e28775537e954a':

10 years agoam 8df8225d: (-s ours) am ac322988: am 00312300: Remove an unnecessary allocation
Romain Guy [Thu, 5 Dec 2013 22:41:05 +0000 (22:41 +0000)]
am 8df8225d: (-s ours) am ac322988: am 00312300: Remove an unnecessary allocation

* commit '8df8225d8d5d15946f36e4b818c22d2e59eabe43':

10 years agoam 082c8154: (-s ours) am 1faca4cd: am 37ee68fc: Merge "Always include a default...
Jeff Sharkey [Thu, 5 Dec 2013 22:40:59 +0000 (22:40 +0000)]
am 082c8154: (-s ours) am 1faca4cd: am 37ee68fc: Merge "Always include a default DocumentStack." into klp-dev

* commit '082c81545be6cbdf14bc91bf42b09acf54ab0816':

10 years agoam 0785ccc2: (-s ours) am 85dbba82: am d3964489: Merge "Some hygiene for the touch...
Svetoslav [Thu, 5 Dec 2013 22:40:53 +0000 (22:40 +0000)]
am 0785ccc2: (-s ours) am 85dbba82: am d3964489: Merge "Some hygiene for the touch explorer." into klp-dev

* commit '0785ccc2ccb5f9401e9a701db0bffd9a9f51cdb0':

10 years agoam bb76afa9: (-s ours) am 87a61b83: am 8a65f5b8: Merge "Allow packages.list access...
Jeff Sharkey [Thu, 5 Dec 2013 22:40:46 +0000 (22:40 +0000)]
am bb76afa9: (-s ours) am 87a61b83: am 8a65f5b8: Merge "Allow packages.list access with new GID." into klp-dev

* commit 'bb76afa9bcf923944786f0ce3ab76c9114cba351':

10 years agoam 177b89e9: (-s ours) am de3ff4b4: am 42773328: Merge "Refactor Canvas.drawPicture...
Jonathan Dixon [Thu, 5 Dec 2013 22:40:41 +0000 (22:40 +0000)]
am 177b89e9: (-s ours) am de3ff4b4: am 42773328: Merge "Refactor Canvas.drawPicture() to delegate to Picture" into klp-dev

* commit '177b89e91102bd58016d9ce474a281e22426e463':

10 years agoam f3aca5f7: (-s ours) am 8418a309: am 89d16f75: am 9b7b4450: am 02eab434: am 4d87d91...
Wink Saville [Thu, 5 Dec 2013 22:40:33 +0000 (22:40 +0000)]
am f3aca5f7: (-s ours) am 8418a309: am 89d16f75: am 9b7b4450: am 02eab434: am 4d87d91d: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev

* commit 'f3aca5f7ca94aad3f0fe7068762474e8e3f98894':

10 years agoam 47dc5a34: (-s ours) am 8eec0cbe: am 292a92e3: am 7c00be48: am 55adb390: am 35152f1...
Wink Saville [Thu, 5 Dec 2013 22:40:28 +0000 (22:40 +0000)]
am 47dc5a34: (-s ours) am 8eec0cbe: am 292a92e3: am 7c00be48: am 55adb390: am 35152f13: Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev

* commit '47dc5a34b9d861e45171591050ee9ee8248031a4':

10 years agoam 15357144: (-s ours) am 94e9e8f1: am f5f75cd8: Merge "Merge commit \'81132d51\...
Wink Saville [Thu, 5 Dec 2013 22:40:22 +0000 (22:40 +0000)]
am 15357144: (-s ours) am 94e9e8f1: am f5f75cd8: Merge "Merge commit \'81132d51\' into fix-merge-conflict" into klp-dev

* commit '1535714401035f134f9ac8bc7d6d209eabfdc9b2':

10 years agoam cc951f12: (-s ours) am 1c7799e2: am 09335703: Merge "Use new ISurfaceComposer...
Jeff Brown [Thu, 5 Dec 2013 22:40:16 +0000 (22:40 +0000)]
am cc951f12: (-s ours) am 1c7799e2: am 09335703: Merge "Use new ISurfaceComposer::destroyDisplay method" into klp-dev

* commit 'cc951f128900f4691e4c55c6267f003e59aa229c':

10 years agoam 027b0651: (-s ours) am 1a5c94fc: am 280f6218: am 81b1fa6f: am 9b6363e5: am cbad124...
Wink Saville [Thu, 5 Dec 2013 22:40:11 +0000 (22:40 +0000)]
am 027b0651: (-s ours) am 1a5c94fc: am 280f6218: am 81b1fa6f: am 9b6363e5: am cbad1243: Merge "Check that hipri has started." into jb-mr2-dev

* commit '027b0651eb136916eebe730441258b7e205b48cf':

10 years agoam ede85d2a: (-s ours) am 6023b828: am 5f055ea1: am bc8bb009: am 93bb7bf2: am 5986f49...
Joe Malin [Thu, 5 Dec 2013 22:40:06 +0000 (22:40 +0000)]
am ede85d2a: (-s ours) am 6023b828: am 5f055ea1: am bc8bb009: am 93bb7bf2: am 5986f497: Merge "Doc Change: Fix 10224981 error in code snippet" into jb-mr2-docs

* commit 'ede85d2a9da14569f5b0fbbc42d46214b58f23dd':

10 years agoam bfdb10d2: (-s ours) am db7b8e21: am 53b9065a: am 42380b6d: am 9f11f105: am 7f09ec3...
Dianne Hackborn [Thu, 5 Dec 2013 22:40:00 +0000 (22:40 +0000)]
am bfdb10d2: (-s ours) am db7b8e21: am 53b9065a: am 42380b6d: am 9f11f105: am 7f09ec39: Fix issue #10226007: Reset apps restores most of the changed settings...

* commit 'bfdb10d273906cb07454179b23fe78de2602b952':

10 years agoam 89424f35: (-s ours) am b4430c5c: am 541ba710: Merge "Add FlpHal layer to support...
destradaa [Thu, 5 Dec 2013 22:39:54 +0000 (22:39 +0000)]
am 89424f35: (-s ours) am b4430c5c: am 541ba710: Merge "Add FlpHal layer to support Location Batching." into klp-dev

* commit '89424f35f774076c3845226b87f9136f00751b2f':

10 years agoam 542ff71a: (-s ours) am 30d4de76: am 8a0de58e: Get ProcessStats callable from other...
Dianne Hackborn [Thu, 5 Dec 2013 22:39:48 +0000 (22:39 +0000)]
am 542ff71a: (-s ours) am 30d4de76: am 8a0de58e: Get ProcessStats callable from other processes.

* commit '542ff71acf35ca41ea4cffd7efd6377829527e29':

10 years agoam 7f6e1aff: (-s ours) am 262f3ff2: am 8ffe17ae: Merge "Update gps status icon to...
David Christie [Thu, 5 Dec 2013 22:39:43 +0000 (22:39 +0000)]
am 7f6e1aff: (-s ours) am 262f3ff2: am 8ffe17ae: Merge "Update gps status icon to be a "high power" location icon. Move icon to right side of the screen and synchronize status with AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION." into klp-dev

* commit '7f6e1affc2dc629c26d974a16fa707eb408fa2a8':

10 years agoam f3eb44f2: (-s ours) am a87a28f3: am ce65961d: Merge "Use a single socket to commun...
Vinit Deshapnde [Thu, 5 Dec 2013 22:39:37 +0000 (22:39 +0000)]
am f3eb44f2: (-s ours) am a87a28f3: am ce65961d: Merge "Use a single socket to communicate with supplicant" into klp-dev

* commit 'f3eb44f2bdf13da34445f4985a9a66b11981e339':

10 years agoam b17aae49: (-s ours) am a0ef1481: am 58930af0: am 68091b9e: am 72289702: am 6180f10...
Joe Malin [Thu, 5 Dec 2013 22:39:31 +0000 (22:39 +0000)]
am b17aae49: (-s ours) am a0ef1481: am 58930af0: am 68091b9e: am 72289702: am 6180f104: DOC CHANGE: Fixed bug 10210178

* commit 'b17aae49873f857c40a46ca9db1aacdcd8c33f1c':

10 years agoam 9e70700c: (-s ours) am 8ce3bb90: (-s ours) am 350b9b9b: am 9d42e438: (-s ours...
The Android Open Source Project [Thu, 5 Dec 2013 22:39:26 +0000 (22:39 +0000)]
am 9e70700c: (-s ours) am 8ce3bb90: (-s ours) am 350b9b9b: am 9d42e438: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

* commit '9e70700c614179b036120513665f78f3656e9af3':

10 years agoam dfc34c7a: (-s ours) am a2790462: am 84135337: am 53d86f6e: am f5cfe708: am e8acd36...
Marco Nelissen [Thu, 5 Dec 2013 22:39:21 +0000 (22:39 +0000)]
am dfc34c7a: (-s ours) am a2790462: am 84135337: am 53d86f6e: am f5cfe708: am e8acd367: Merge "When deleting a db file, Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together."

* commit 'dfc34c7aa0bb03522d34b075f93d92f8d1e60e7d':

10 years agoam e3a1f7b6: (-s ours) am 910ebd9e: am d6aa2471: am ca4553d3: am 7ffbcb28: am ca5d99a...
Marco Nelissen [Thu, 5 Dec 2013 22:39:15 +0000 (22:39 +0000)]
am e3a1f7b6: (-s ours) am 910ebd9e: am d6aa2471: am ca4553d3: am 7ffbcb28: am ca5d99ac: Merge "Guarantee that all db related files are deleted together."

* commit 'e3a1f7b6614e9e42f45f3de8ca3e3e07c69573bc':

10 years agoam 1cb3c233: (-s ours) am 4458c200: am 672d323b: Merge "Developer option to force...
Amith Yamasani [Thu, 5 Dec 2013 22:39:10 +0000 (22:39 +0000)]
am 1cb3c233: (-s ours) am 4458c200: am 672d323b: Merge "Developer option to force RTL layout" into klp-dev

* commit '1cb3c2332d86c06799b75e74b8263f008b79cdf3':

10 years agoam a840c3c5: (-s ours) am 0a2ad75d: am 4104d329: Merge "Add helper methods to set...
David Christie [Thu, 5 Dec 2013 22:39:04 +0000 (22:39 +0000)]
am a840c3c5: (-s ours) am 0a2ad75d: am 4104d329: Merge "Add helper methods to set/query the location master switch. Consolidates the logic of exactly what the master switch means so that if we change in the future, we don\'t have to find all the different parts of the code that

* commit 'a840c3c5a5951cf2b5aae674c3cdf450ca1bd5a7':

10 years agoam cb0a2ddb: (-s ours) am d5e9f2c1: am c059dbe9: Merge "Fix recent regression in...
John Spurlock [Thu, 5 Dec 2013 22:38:58 +0000 (22:38 +0000)]
am cb0a2ddb: (-s ours) am d5e9f2c1: am c059dbe9: Merge "Fix recent regression in hideytoast." into klp-dev

* commit 'cb0a2ddb71f0bb7bd66a5365692fb37c96c8b72f':

10 years agoam 44f97445: (-s ours) am 4a76922e: am d646882a: Add missing densities for HUN backgr...
Daniel Sandler [Thu, 5 Dec 2013 22:38:52 +0000 (22:38 +0000)]
am 44f97445: (-s ours) am 4a76922e: am d646882a: Add missing densities for HUN backgrounds.

* commit '44f974453da560eb05b853144cc7659c7aa79b0d':

10 years agoam c1c5d2df: (-s ours) am 9a81e154: am f6971c80: Merge "OK, now it\'s a release....
Daniel Sandler [Thu, 5 Dec 2013 22:38:46 +0000 (22:38 +0000)]
am c1c5d2df: (-s ours) am 9a81e154: am f6971c80: Merge "OK, now it\'s a release." into klp-dev

* commit 'c1c5d2dfd5b66e3efb73b9e18dd9f37c6d69078a':

10 years agoam 7815c8bd: (-s ours) am 3282fa98: (-s ours) am bd6a6e60: Use package CompatibilityI...
Craig Mautner [Thu, 5 Dec 2013 22:38:40 +0000 (22:38 +0000)]
am 7815c8bd: (-s ours) am 3282fa98: (-s ours) am bd6a6e60: Use package CompatibilityInfo as default. DO NOT MERGE

* commit '7815c8bd17b85010c7203f2575bce30079c70a49':

10 years agoam af0ea645: (-s ours) am d9c51fdc: am 7a605df3: Merge "Don\'t always auto-collapse...
John Spurlock [Thu, 5 Dec 2013 22:38:35 +0000 (22:38 +0000)]
am af0ea645: (-s ours) am d9c51fdc: am 7a605df3: Merge "Don\'t always auto-collapse an empty notification shade."

* commit 'af0ea64596c5a7e59f103c6832d3d7db4f384b52':

10 years agoam 090a46b5: (-s ours) am 60708eaf: am e97f90b9: on screen off: convert heads up...
Chris Wren [Thu, 5 Dec 2013 22:38:30 +0000 (22:38 +0000)]
am 090a46b5: (-s ours) am 60708eaf: am e97f90b9: on screen off: convert heads up to full screen intent.

* commit '090a46b54cd1dc21ea4e42eb0e21b01d4a7f2587':

10 years agoam ebf8af74: (-s ours) am e7ea9466: am 6ccf0aff: Merge "heads up notifications always...
Chris Wren [Thu, 5 Dec 2013 22:38:24 +0000 (22:38 +0000)]
am ebf8af74: (-s ours) am e7ea9466: am 6ccf0aff: Merge "heads up notifications always take the top spot"

* commit 'ebf8af7456171a2306e008afa636285dee3f4d07':

10 years agoam a866f6df: (-s ours) am cf67ae06: am 137e5a3b: Merge "Fix the build"
Ben Murdoch [Thu, 5 Dec 2013 22:38:19 +0000 (22:38 +0000)]
am a866f6df: (-s ours) am cf67ae06: am 137e5a3b: Merge "Fix the build"

* commit 'a866f6df5e56c7a29bdceb723307bc96785358e2':

10 years agoam 87a4a466: (-s ours) am 4cbafb6a: am d4db6cbc: don\'t bump an active heads up for...
Chris Wren [Thu, 5 Dec 2013 22:38:13 +0000 (22:38 +0000)]
am 87a4a466: (-s ours) am 4cbafb6a: am d4db6cbc: don\'t bump an active heads up for a corrupt notification

* commit '87a4a46604ac8bc8259b5af358961f69e8924b92':

10 years agoam 7f5709bb: (-s ours) am 10afd0f0: am 464a8ce9: Merge "Animate the heads up notifica...
Chris Wren [Thu, 5 Dec 2013 22:38:08 +0000 (22:38 +0000)]
am 7f5709bb: (-s ours) am 10afd0f0: am 464a8ce9: Merge "Animate the heads up notification into the shade."

* commit '7f5709bbd5c193a0d08e0ffeb2d924222bc565d6':

10 years agoam 6241ee27: (-s ours) am 457d901b: am bb8b602b: Merge "ensure heads up slider is...
Chris Wren [Thu, 5 Dec 2013 22:38:02 +0000 (22:38 +0000)]
am 6241ee27: (-s ours) am 457d901b: am bb8b602b: Merge "ensure heads up slider is initialized."

* commit '6241ee27cd33857f9144a86a074992648641de59':

10 years agoam 6709285a: (-s ours) am 944e41fe: am 10dc5d97: Merge "proper geometry for heads...
Chris Wren [Thu, 5 Dec 2013 22:37:57 +0000 (22:37 +0000)]
am 6709285a: (-s ours) am 944e41fe: am 10dc5d97: Merge "proper geometry for heads up on tablets."

* commit '6709285ab95c7e473ee451659c6c97484e96e136':

10 years agoam 96756e99: (-s ours) am 2c18bc28: am 77ece7b1: Merge "Extend assist context to...
Matt Casey [Thu, 5 Dec 2013 22:37:52 +0000 (22:37 +0000)]
am 96756e99: (-s ours) am 2c18bc28: am 77ece7b1: Merge "Extend assist context to foreground services"

* commit '96756e99e2f7e8d3e75aa405951b1538116c1c7a':

10 years agoam b35872f3: (-s ours) am 38cfa935: am 81ba9784: Merge "NFC: Unify ApduServiceInfo...
Martijn Coenen [Thu, 5 Dec 2013 22:37:46 +0000 (22:37 +0000)]
am b35872f3: (-s ours) am 38cfa935: am 81ba9784: Merge "NFC: Unify ApduServiceInfo for on/off host."

* commit 'b35872f3a7622b168896c564136bf9e59ac9e96b':