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

120901 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Kralevich
6018d01427 am bf88b659: am 5fa89d55: am 6b8a3a52: am f7422885: Merge "Augment SELinuxMMAC functionality." 
* commit 'bf88b659b6c02143b464c0551d4875f7911ed269':
  Augment SELinuxMMAC functionality.
 2013-12-06 16:26:08 +00:00
Nick Kralevich
bf88b659b6 am 5fa89d55: am 6b8a3a52: am f7422885: Merge "Augment SELinuxMMAC functionality." 
* commit '5fa89d55712110c2932f76357216e7a77b3b317e':
  Augment SELinuxMMAC functionality.
 2013-12-06 16:22:58 +00:00
Nick Kralevich
5fa89d5571 am 6b8a3a52: am f7422885: Merge "Augment SELinuxMMAC functionality." 
* commit '6b8a3a52acf1c2722551f1ea1ce47831f87939cd':
  Augment SELinuxMMAC functionality.
 2013-12-06 08:20:18 -08:00
Nick Kralevich
6b8a3a52ac am f7422885: Merge "Augment SELinuxMMAC functionality." 
* commit 'f7422885a99c5d240f70c2f8227ae44abeea3e5c':
  Augment SELinuxMMAC functionality.
 2013-12-06 08:17:23 -08:00
Nick Kralevich
f7422885a9 Merge "Augment SELinuxMMAC functionality." 2013-12-06 16:13:58 +00:00
Robert Craig
99a626c271 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
 2013-12-06 08:51:20 -05:00
The Android Open Source Project
c6499939fa am dcff5cef: am d7a5aaee: am ebcb32f5: Merge commit \'bac61807d3bcfff957b358cb9ad77850bd373689\' into HEAD 
* commit 'dcff5ceff6ef0050af4c49a8c2a86ab663a88665':
 2013-12-06 02:50:46 +00:00
The Android Open Source Project
dcff5ceff6 am d7a5aaee: am ebcb32f5: Merge commit \'bac61807d3bcfff957b358cb9ad77850bd373689\' into HEAD 
* commit 'd7a5aaee145879804006d2c00daa4c14d544e03a':
 2013-12-06 01:43:38 +00:00
The Android Open Source Project
d7a5aaee14 am ebcb32f5: Merge commit \'bac61807d3bcfff957b358cb9ad77850bd373689\' into HEAD 
* commit 'ebcb32f58a6220802ca129ea33f47b4b69931a10':
 2013-12-05 17:27:10 -08:00
Alan Viverette
e100cd992d Merge "Fix typo in LayerDrawable" 2013-12-05 23:35:48 +00:00
Alan Viverette
89417177d5 Fix typo in LayerDrawable 
Change-Id: I6c73cb90d0c161d29e8d41c54850d66840c947d7
 2013-12-05 15:34:28 -08:00
Baligh Uddin
5f60e1e4eb am d22f6a62: (-s ours) am 61c9706b: (-s ours) am 43e56c4a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'd22f6a6296b0fc7dee08bc442a54343c1b478a4c':
 2013-12-05 22:51:20 +00:00
Baligh Uddin
9d062451d4 am 4830bc50: (-s ours) am dc5f592c: (-s ours) am 78f5ef71: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '4830bc50848e3c575e74ef9c996821af45943cf7':
 2013-12-05 22:51:15 +00:00
Svetoslav Ganov
8cc7a9d21f am 335289aa: (-s ours) am 51843f8a: am 371c46fe: Merge "Remove exceptions from the printer discovery session APIs." into klp-dev 
* commit '335289aae79b5dc759629a89b97bf059a3d1e466':
 2013-12-05 22:51:10 +00:00
Jose Lima
2b89bfbb26 am 758485f0: (-s ours) am 0d27bc29: am 56e0d6b8: Merge "Allow configuration of Toast gravity settings" into klp-dev 
* commit '758485f003844b9426a6883f43f7354c3f8a4bfd':
 2013-12-05 22:51:05 +00:00
David Christie
d890c6821d 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':
 2013-12-05 22:50:58 +00:00
Kristian Monsen
29cc87dcae am 44e0da4e: (-s ours) am c319ddd9: am 4c737496: Merge "Change the exception msg" into klp-dev 
* commit '44e0da4ebc2107d1bf92465bf9a1245da874ef0c':
 2013-12-05 22:50:53 +00:00
Vinit Deshapnde
82ae155090 am ba690f48: (-s ours) am f76c1685: am 049cbd64: Merge "Fix a bug in single socket connection to Wifi Supplicant" into klp-dev 
* commit 'ba690f48b95010f096c4df04b5fec91bf6bf73c7':
 2013-12-05 22:50:48 +00:00
keunyoung
4ab86382f5 am 44894df5: (-s ours) am 72d29c2d: am ddbfdfa5: Merge "fix race condition when a new display is added" into klp-dev 
* commit '44894df5d79500ade82cc8f250cc8fe70b28af87':
 2013-12-05 22:50:43 +00:00
Michael Wright
94388e28a9 am 054a7f5c: (-s ours) am aad62128: am 51b4a40e: Merge "Expose vendor and product IDs for InputDevices" into klp-dev 
* commit '054a7f5cba275b929c60b17128c13026cbdcd154':
 2013-12-05 22:50:37 +00:00
Victoria Lease
416a5731bd am 5126f194: (-s ours) am 4b982e49: am ebec4b6e: Merge "fix kBW_Format glyphs" into klp-dev 
* commit '5126f194c08dcb230a74c5be1ceaf094d92f759e':
 2013-12-05 22:50:31 +00:00
Romain Guy
1ef2d26529 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':
 2013-12-05 22:50:26 +00:00
Alan Viverette
d762c97c5c 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':
 2013-12-05 22:50:20 +00:00
Svetoslav
c9c4e8d8e9 am ae2b3981: (-s ours) am beb7b449: am b9b1701d: Merge "Make PrintFileDocumentAdapter non-final." into klp-dev 
* commit 'ae2b398150a2ed66866aef2c3781020e1ca9f059':
 2013-12-05 22:50:14 +00:00
Chet Haase
3b219bffe1 am a004f72c: (-s ours) am 54276ad3: am cd89feb9: Merge "pause/resume for Animators" into klp-dev 
* commit 'a004f72cf00555aa2694b97ff6c17b97397cd471':
 2013-12-05 22:44:46 +00:00
Craig Mautner
2aa9f1f9c8 am 7a9ec2cd: (-s ours) am afa1231e: am b6da9115: Merge "Remove incorrect warning." into klp-dev 
* commit '7a9ec2cd8d00c906603c5cb88625c97b47378947':
 2013-12-05 22:44:40 +00:00
Katie McCormick
b21b50a9c8 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':
 2013-12-05 22:44:35 +00:00
Selim Gurun
3b1b6d1345 am aff9c487: (-s ours) am ff1b3f07: am 1232c51e: Merge "Add the API to support webview printing" into klp-dev 
* commit 'aff9c48759619c4025927fec4cdf6d5e274db144':
 2013-12-05 22:44:29 +00:00
Romain Guy
ea10b06c2e am 9b7bf2ba: (-s ours) am 98e50c50: am 964f2b30: Merge "Update Bitmap.createBitmap() documentation" into klp-dev 
* commit '9b7bf2ba1e9f3017a4edc498f455091935d675ab':
 2013-12-05 22:44:23 +00:00
Scott Main
f3392155b6 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':
 2013-12-05 22:44:18 +00:00
Scott Main
8517e7e021 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':
 2013-12-05 22:44:12 +00:00
Andreas Huber
2177ee41d2 am 2717e4ea: (-s ours) am cee3a2a5: am 8d5f3e31: Manage jclass objects (and most jobjects) in jni code using ScopedLocalRef 
* commit '2717e4eabe581d4f461918f78fead736f65667ae':
 2013-12-05 22:44:06 +00:00
Martin Kosiba
8f59c07043 am 1d4ddb05: (-s ours) am f8d747b3: (-s ours) am 9a68f82f: Add super_onDrawVerticalScrollBar to WebView.PrivateAccess. DO NOT MERGE 
* commit '1d4ddb05e609b2f04aec16c1a06edad1c2232741':
 2013-12-05 22:44:01 +00:00
Ben Murdoch
fb4482c5ee am 231fb187: (-s ours) am 4826434c: am ed735c9a: Add missing cleanspec 
* commit '231fb187f5b29bf0a1d377e18a9b44b15fd86244':
 2013-12-05 22:43:56 +00:00
Jeff Sharkey
642596f3cc am 20861b8f: (-s ours) am 35d525c9: am 998cfa2c: Merge "API to discover granted Uri permissions." into klp-dev 
* commit '20861b8f16015c5e5b89bdc8025cc311aeff6883':
 2013-12-05 22:43:50 +00:00
Jeff Sharkey
e50892e01b am 49ab0f16: (-s ours) am 34412965: am c2f8da87: Merge "Bring along BridgeContext for the ride." into klp-dev 
* commit '49ab0f1636833270019b3c1ed733b0a4129f08be':
 2013-12-05 22:43:45 +00:00
Jeff Sharkey
35419830c6 am ccff82ee: (-s ours) am 0c305430: am 436b6ee3: Merge "Catch a few extra users of UserEnvironment." into klp-dev 
* commit 'ccff82ee2f3d44088c4e7dd1de7e11de4150b63a':
 2013-12-05 22:43:40 +00:00
Jeff Sharkey
3f9ceb0cbf am 134f1e9b: (-s ours) am 1d685ec0: am 6e14b22c: Merge "APIs for multiple external storage devices." into klp-dev 
* commit '134f1e9bdc0922e6e0a6c14978712736797ff04f':
 2013-12-05 22:43:35 +00:00
Svetoslav Ganov
5dc434e21e am 892c8f3d: (-s ours) am 09848031: am b8160401: Merge "Fix the build" into klp-dev 
* commit '892c8f3d633301b2c6efa5ca38dd375c907612a3':
 2013-12-05 22:43:29 +00:00
Svetoslav Ganov
94dbf1fb19 am ee6556ab: (-s ours) am e1c2dfee: am c7c4d6dd: Merge "Refinement of the print service APIs." into klp-dev 
* commit 'ee6556abc93f40955a745b0d2c3329d731c360b4':
 2013-12-05 22:43:24 +00:00
Craig Mautner
a9cd87641d am 61dce579: (-s ours) am b8029214: am 0dd303cf: Merge "Put animation background behind visible wallpaper" into klp-dev 
* commit '61dce5799a9b037a1ce4d1e723453211391e9237':
 2013-12-05 22:43:19 +00:00
Wink Saville
afefad3213 am 0816267f: (-s ours) am a9f2faa9: am a48ad8bd: PROXY_SERVICE may be missing and its reference null. 
* commit '0816267f70c9ef14e31f49ffd9bdf4c38a917f48':
 2013-12-05 22:43:14 +00:00
Katie McCormick
2a43b6811d 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':
 2013-12-05 22:43:08 +00:00
Zhihai Xu
b989320598 am 87251061: (-s ours) am 71716cc5: am 97aaa8f0: Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev 
* commit '8725106123f62cb5057beaba65f3c013b4e5a140':
 2013-12-05 22:43:03 +00:00
destradaa
01431b0757 am 5174a7a0: (-s ours) am 1b90bdf2: am f910d320: Merge "Address Robin\'s code review comments in initial FlpHal submission." into klp-dev 
* commit '5174a7a05e8b80b9e6fd9420ca781c2fe494bcc0':
 2013-12-05 22:42:57 +00:00
Dianne Hackborn
a7aae4f62b am 3edd90d4: (-s ours) am 8e4e7a20: am 35786c34: Merge "Allow bound processes to go PROCESS_STATE_TOP." into klp-dev 
* commit '3edd90d47d89332235a260f2b0787789571b2848':
 2013-12-05 22:42:52 +00:00
Romain Guy
5d8abc58dc am 5d6930fe: (-s ours) am c70629f1: am 583ed765: Merge "Take shadow bounds into account for quick rejects Bug #8634346" into klp-dev 
* commit '5d6930fe4ea0c24f6e1fde4a250cfb941311ed7b':
 2013-12-05 22:42:46 +00:00
Baligh Uddin
c6b6e7f59b am e6eae160: (-s ours) am 2d1716a8: (-s ours) am 67d5c290: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'e6eae1609e73205edd560846a032c89dabe9827f':
 2013-12-05 22:42:40 +00:00
Romain Guy
834672cd82 am 1612eac0: (-s ours) am 06c2bad6: am 96aadf83: Merge "Prevent AsyncTask from creating too many threads Bug #10228005" into klp-dev 
* commit '1612eac06df6ce849cb95935c70ba94093f8d321':
 2013-12-05 22:42:34 +00:00
Baligh Uddin
503177ed6d am 8c1df1b2: (-s ours) am 4b643f0e: (-s ours) am 40885045: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '8c1df1b24a5dd80174a548f30e9da0faf57d5ae9':
 2013-12-05 22:42:28 +00:00