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

117933 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
d50d41e4df DO NOT MERGE: Don't freak out if SystemUiService isn't available 
Reducing dependencies on system services

Change-Id: Ifb1a3bfb9c8dda5e22ec698ddb588058d20bd566
 2013-12-09 15:14:39 -08:00
Mike Lockwood
e63f6f7c8d DO NOT MERGE: Remove obsolete "headless" support 
Change-Id: I829fe48e6ebcb819e260646bb19ac6ddfcf07f83
 2013-12-09 15:14:37 -08:00
Qiwen Zhao
de8905e495 DO NOT MERGE reset to goog/klp-volantis-dev 2013-12-09 14:17:43 -08:00
Lorenzo Colitti
263c4788dc am 30253d7a: am 2daa0c93: Merge "Add address flags and scope to LinkAddress." 
* commit '30253d7a649bd4fc6a436ae880a70e1142c1e58f':
  Add address flags and scope to LinkAddress.
 2013-12-09 18:31:25 +00:00
Lorenzo Colitti
30253d7a64 am 2daa0c93: Merge "Add address flags and scope to LinkAddress." 
* commit '2daa0c93c4a0a9d18f4ef4486369fb8c90cd1ea2':
  Add address flags and scope to LinkAddress.
 2013-12-09 10:28:19 -08:00
Baligh Uddin
0126e98034 am 19158fc3: (-s ours) am 325a1352: (-s ours) am 0bfbb676: (-s ours) Import translations. DO NOT MERGE 
* commit '19158fc39a40f51c87195f5e3066bd891d359a2e':
  Import translations. DO NOT MERGE
 2013-12-09 18:10:32 +00:00
Baligh Uddin
19158fc39a am 325a1352: (-s ours) am 0bfbb676: (-s ours) Import translations. DO NOT MERGE 
* commit '325a13527d8c18c93bee266475cade9037f71698':
  Import translations. DO NOT MERGE
 2013-12-09 10:08:25 -08:00
Baligh Uddin
325a13527d am 0bfbb676: (-s ours) Import translations. DO NOT MERGE 
* commit '0bfbb676277c907444b09ba9e653491b32dddf9c':
  Import translations. DO NOT MERGE
 2013-12-09 10:05:02 -08:00
Baligh Uddin
0bfbb67627 Import translations. DO NOT MERGE 
Change-Id: Iaac5bb8f0ee9e7471e6f6401eab46a86a406ce4c
Auto-generated-cl: translation import
 2013-12-09 09:53:12 -08:00
Lorenzo Colitti
2daa0c93c4 Merge "Add address flags and scope to LinkAddress." 2013-12-07 02:43:04 +00:00
Scott Main
427e05b4af am 6fc956c7: am 4681d452: am 9cefb571: Merge "Revert "add Drive API feature page. fix link text on several pages"" into klp-docs 
* commit '6fc956c7ac7602e23f9bf164760db137cebdbbb8':
  Revert "add Drive API feature page. fix link text on several pages"
 2013-12-07 01:50:13 +00:00
Scott Main
6fc956c7ac am 4681d452: am 9cefb571: Merge "Revert "add Drive API feature page. fix link text on several pages"" into klp-docs 
* commit '4681d4521cb955fcf66b6aad809aa99836cbb30a':
  Revert "add Drive API feature page. fix link text on several pages"
 2013-12-06 17:48:00 -08:00
Scott Main
4681d4521c am 9cefb571: Merge "Revert "add Drive API feature page. fix link text on several pages"" into klp-docs 
* commit '9cefb57116653346729a9fc606e8ff4f899ad380':
  Revert "add Drive API feature page. fix link text on several pages"
 2013-12-07 01:45:31 +00:00
Scott Main
9cefb57116 Merge "Revert "add Drive API feature page. fix link text on several pages"" into klp-docs 2013-12-07 01:42:31 +00:00
Scott Main
f2be361b46 Revert "add Drive API feature page. fix link text on several pages" 
This reverts commit 680a1f67cd39b127663d2e8bc4b5f3ca1d868274.

Change-Id: Icc474d08e5fba678b683ae01280e015ae38dcf72
 2013-12-07 01:42:10 +00:00
Scott Main
cf6c169fe0 am 71638ac4: am 2c93b68a: am b821a87d: update robots.txt to disallow the community/ pages 
* commit '71638ac4afb54bd0f4849c1179c370ee75462565':
  update robots.txt to disallow the community/ pages
 2013-12-07 00:17:32 +00:00
Scott Main
71638ac4af am 2c93b68a: am b821a87d: update robots.txt to disallow the community/ pages 
* commit '2c93b68a0309e74e5c011cba1ef98951236f9f29':
  update robots.txt to disallow the community/ pages
 2013-12-06 16:15:15 -08:00
Scott Main
2c93b68a03 am b821a87d: update robots.txt to disallow the community/ pages 
* commit 'b821a87d1b9310d7f07880c80d0b5ccafd59986a':
  update robots.txt to disallow the community/ pages
 2013-12-07 00:12:41 +00:00
Scott Main
03775d95a8 am 2bbea2bb: am 38854cab: am c45eebe1: add Android Community page 
* commit '2bbea2bbc1b0efe60efcb255404661ca5160ab04':
  add Android Community page
 2013-12-07 00:11:35 +00:00
Scott Main
2bbea2bbc1 am 38854cab: am c45eebe1: add Android Community page 
* commit '38854cabba3524316f8e1a9ffe9f4ac15e14d72f':
  add Android Community page
 2013-12-06 16:09:24 -08:00
Scott Main
b821a87d1b update robots.txt to disallow the community/ pages 
Change-Id: I318308f7219b296d92039cba2b6f5ace321f697f
 2013-12-06 16:08:01 -08:00
Scott Main
38854cabba am c45eebe1: add Android Community page 
* commit 'c45eebe1868deb93c54c29885163a13a497eb86a':
  add Android Community page
 2013-12-07 00:06:29 +00:00
Scott Main
c45eebe186 add Android Community page 
Change-Id: I8a9c98931b274dbb27d7952e2278eaf7798da343
 2013-12-06 15:48:22 -08:00
Scott Main
41d6be57d3 am 2d285312: am 37a8d7c5: am 680a1f67: add Drive API feature page. fix link text on several pages 
* commit '2d2853120eaf3ccd6867ec7038c38ef794baaecc':
  add Drive API feature page. fix link text on several pages
 2013-12-06 23:44:59 +00:00
Scott Main
2d2853120e am 37a8d7c5: am 680a1f67: add Drive API feature page. fix link text on several pages 
* commit '37a8d7c54cbdb36cd6ff9c6688140b99e256c644':
  add Drive API feature page. fix link text on several pages
 2013-12-06 15:41:23 -08:00
Scott Main
37a8d7c54c am 680a1f67: add Drive API feature page. fix link text on several pages 
* commit '680a1f67cd39b127663d2e8bc4b5f3ca1d868274':
  add Drive API feature page. fix link text on several pages
 2013-12-06 23:38:43 +00:00
Scott Main
680a1f67cd add Drive API feature page. 
fix link text on several pages

Change-Id: I717eba278bc2cc09d3ee148a08700e8e353312d2
 2013-12-06 14:50:18 -08: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
Lorenzo Colitti
64483947fd Add address flags and scope to LinkAddress. 
This is necessary so that the framework can know whether an IPv6
address is likely to be usable (i.e., if it's global scope and
preferred). Also, it will simplify the address notification
methods in INetworkManagementEventObserver, which currently take
the address, the flags, and the scope as separate arguments.

1. Add flags and scope to the class and update the unit test.
   Use the IFA_F_* and RT_SCOPE_* constants defined by libcore.
   Since most callers don't know about flags and scope, provide
   constructors that default the flags to zero and determine the
   scope from the address. Addresses notified by the kernel will
   have these properly set. Make multicast addresses invalid.
   Update the class documentation.
2. Provide an isSameAddressAs() method that compares only the
   address and prefix information between two LinkAddress
   objects. This is necessary because an interface can't have
   two addresses with the same address/prefix but different
   flags.
3. Update LinkProperties's addLinkAddress and removeLinkAddress
   to identify existing addresses to add/remove using
   isSameAddressAs instead of implicit equals(). Specifically:
   - If addLinkAddress is called with an address that is already
     present, the existing address's flags and scope are updated.
     This allows, for example, an address on an interface to go
     from preferred to deprecated when it expires, without it
     having to be removed and re-added.
   - If removeLinkAddress is called with an address that is
     present but with different flags, it deletes that address
     instead of failing to find a match.
4. Update the INetworkManagementEventObserver address
   notification methods to take just a LinkAddress instead of
   LinkAddress, flags, and scope. While I'm at it, change the
   order of the arguments for consistency with the other
   functions in the interface.

Change-Id: Id8fe0f09a7e8f6bee1ea3b52102178b689a9336e
 2013-12-06 13:54:35 +09: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
Baligh Uddin
d22f6a6296 am 61c9706b: (-s ours) am 43e56c4a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '61c9706bac583a1cf95be12d7f5e96f652669d72':
 2013-12-05 21:30:08 +00:00
Baligh Uddin
4830bc5084 am dc5f592c: (-s ours) am 78f5ef71: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'dc5f592c0344e9fc308c68d7d2e80b8b7f82acab':
 2013-12-05 21:30:03 +00:00
Svetoslav Ganov
335289aae7 am 51843f8a: am 371c46fe: Merge "Remove exceptions from the printer discovery session APIs." into klp-dev 
* commit '51843f8aa9a76207627288252a99f12141195a07':
 2013-12-05 21:29:54 +00:00
Jose Lima
758485f003 am 0d27bc29: am 56e0d6b8: Merge "Allow configuration of Toast gravity settings" into klp-dev 
* commit '0d27bc294610d7415093804a20d380f2e78bd30b':
 2013-12-05 21:29:40 +00:00
David Christie
e4fdda2793 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 network prov 
* commit '8810a0c3c242ab0ac252261d7f73258769cc9f2d':
 2013-12-05 21:29:25 +00:00
Kristian Monsen
44e0da4ebc am c319ddd9: am 4c737496: Merge "Change the exception msg" into klp-dev 
* commit 'c319ddd9ec9c630840a11765a4630b1375fe9664':
 2013-12-05 21:29:16 +00:00
Vinit Deshapnde
ba690f48b9 am f76c1685: am 049cbd64: Merge "Fix a bug in single socket connection to Wifi Supplicant" into klp-dev 
* commit 'f76c1685a55302e95086818b5178d9af257b3e4f':
 2013-12-05 21:29:03 +00:00
keunyoung
44894df5d7 am 72d29c2d: am ddbfdfa5: Merge "fix race condition when a new display is added" into klp-dev 
* commit '72d29c2d0d062122710e4d3d4eed68f04be3b275':
 2013-12-05 21:28:57 +00:00
Michael Wright
054a7f5cba am aad62128: am 51b4a40e: Merge "Expose vendor and product IDs for InputDevices" into klp-dev 
* commit 'aad62128100f0c1562f9c61a721b703480ed3772':
 2013-12-05 21:28:41 +00:00
Victoria Lease
5126f194c0 am 4b982e49: am ebec4b6e: Merge "fix kBW_Format glyphs" into klp-dev 
* commit '4b982e49751c87bc4d55c3ab59958904ad9f701b':
 2013-12-05 21:28:16 +00:00
Romain Guy
1668ebf484 am 76bf4d6d: am d1f6b624: Merge "Take text alignment into account to compue text bounds Bug #10258621" into klp-dev 
* commit '76bf4d6dbee90268ecdf5eab63a9048fcaa8ff02':
 2013-12-05 21:27:56 +00:00
Alan Viverette
f5a89a2bb3 am 1e68ffc7: am 890db42b: Merge "Not create context menu when mouse right click outside list/grid items" into klp-dev 
* commit '1e68ffc72fda060b316f0cf6d2a310a601965577':
 2013-12-05 21:27:48 +00:00
Svetoslav
ae2b398150 am beb7b449: am b9b1701d: Merge "Make PrintFileDocumentAdapter non-final." into klp-dev 
* commit 'beb7b44962b7dfd2a9d4cc56ec6417037ffff862':
 2013-12-05 21:27:39 +00:00
The Android Open Source Project
ebcb32f58a Merge commit 'bac61807d3bcfff957b358cb9ad77850bd373689' into HEAD 
Change-Id: I29374270c8e0c2f2859efaf1d55af9f73da0f8d7
 2013-12-05 13:10:46 -08:00
Ying Wang
7a15f93228 am babea8d8: am 6e2d0c1d: Merge "wifi: Remove obsolete libwpa_client library" 
* commit 'babea8d8f2d4b3a40ab4e37646c26783c2288e87':
  wifi: Remove obsolete libwpa_client library
 2013-12-05 20:33:43 +00:00