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

124506 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Carlstrom
bd71bf1814 am 8922ddba: am a6e06889: Merge "Add profiler type options" 
* commit '8922ddbab1e394a59f957e8598fbbf88357e7838':
  Add profiler type options
 2014-07-01 22:37:18 +00:00
Brian Carlstrom
8922ddbab1 am a6e06889: Merge "Add profiler type options" 
* commit 'a6e06889fce7fbf2049f421daef02b8986736f77':
  Add profiler type options
 2014-07-01 22:32:01 +00:00
Chris Craik
86b55c52c7 Fix klp-modular-dev-plus-aosp build 
Change-Id: I546dfef29b5875633de18f6a7e3f419a0d012faa
 2014-07-01 15:24:37 -07:00
Nick Kralevich
db32fb646d am d172419e: am 9b1a7d45: Merge "Allow different SELinux policies for third party apps." 
* commit 'd172419e9a36f61af8c98d316ec2625e1f1304f6':
  Allow different SELinux policies for third party apps.
 2014-07-01 21:16:14 +00:00
Nick Kralevich
d172419e9a am 9b1a7d45: Merge "Allow different SELinux policies for third party apps." 
* commit '9b1a7d4570dd692cf86c385dfcdf057ad966fa57':
  Allow different SELinux policies for third party apps.
 2014-07-01 21:13:12 +00:00
Nick Kralevich
9b1a7d4570 Merge "Allow different SELinux policies for third party apps." 2014-07-01 19:16:01 +00:00
Robert Craig
83b54ecab7 Allow different SELinux policies for third party apps. 
Prior support forced all third party apps
to be resolved against the default stanza
of the mac_permissions.xml file when assigning
seinfo labels. This meant that all third party
apps, in effect, were untrusted regardless of
cert and therefore received the same selinux domain.
This also had the unfortunate side effect of forcing
certain third party apps into the wrong domains
because of shared userid requests among apps.

This patch removes that restriction and instead
allows all apps, regardless of location, to be
matched against the full mac_permissions.xml
policy file. This then allows all apps signed
with known good certs to receive the same selinux
domains of other apps with whom they share trust.

Change-Id: Iba569c046135c0e81140faf6296c5da26a243037
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
 2014-07-01 13:53:11 -07:00
Marco Nelissen
1ed64c65a7 am 899c15ef: am db816cef: Merge "Make sure we clean up" 
* commit '899c15ef2053f0cebfeda90b5211e80310e6f278':
  Make sure we clean up
 2014-07-01 18:21:41 +00:00
Marco Nelissen
899c15ef20 am db816cef: Merge "Make sure we clean up" 
* commit 'db816cef0dd1f1988fbcf3c70a66f9c4acf73358':
  Make sure we clean up
 2014-07-01 18:15:28 +00:00
Baligh Uddin
b77da19e59 am b9246ef5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'b9246ef52c7f8ea7c4888c0f45005a49792a8614':
  Import translations. DO NOT MERGE
 2014-07-01 18:14:47 +00:00
Baligh Uddin
5b3e66d0f6 am 9846e4c6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '9846e4c676e9b1b656081bab3f9cb304f8cc3cdf':
  Import translations. DO NOT MERGE
 2014-07-01 18:14:40 +00:00
Baligh Uddin
3bb733baa2 am 4a4fa0a3: (-s ours) Import translations. DO NOT MERGE 
* commit '4a4fa0a30a4d53816fcb56545054d624f3243cb6':
  Import translations. DO NOT MERGE
 2014-07-01 18:14:36 +00:00
Baligh Uddin
4a4fa0a30a Import translations. DO NOT MERGE 
Change-Id: I1027a88bab0d00d223807bba87f9bbb75aef4d79
Auto-generated-cl: translation import
 2014-07-01 10:47:53 -07:00
Marco Nelissen
db816cef0d Merge "Make sure we clean up" 2014-07-01 14:59:07 +00:00
Brian Carlstrom
a6e06889fc Merge "Add profiler type options" 2014-07-01 14:58:13 +00:00
Baligh Uddin
9846e4c676 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-07-01 14:50:43 +00:00
Baligh Uddin
efee5db3c7 Import translations. DO NOT MERGE 
Change-Id: I7ad5171c74ba22fff8602cf99b6a87f93f0f86a0
Auto-generated-cl: translation import
 2014-07-01 10:45:41 -07:00
Baligh Uddin
b9246ef52c Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-07-01 14:40:15 +00:00
Baligh Uddin
a9b6277c10 Import translations. DO NOT MERGE 
Change-Id: I8995e4e7008c4ec3c06e6ef65046d8fc9987c33a
Auto-generated-cl: translation import
 2014-07-01 10:44:30 -07:00
Narayan Kamath
8c1c0a6881 am 7f319c47: am 1dc550fa: Merge "Fix packing of values at offset 16." 
* commit '7f319c47c8f5e947638eb1e5e73789ff83123bba':
  Fix packing of values at offset 16.
 2014-07-01 10:23:44 +00:00
Narayan Kamath
7f319c47c8 am 1dc550fa: Merge "Fix packing of values at offset 16." 
* commit '1dc550fa7333257a130d71866be37181f8ee553b':
  Fix packing of values at offset 16.
 2014-07-01 09:22:10 +00:00
Robert Ly
9baaf2ce84 am 7459dfed: Merge "docs: add new UX images for notifications and wear" into klp-modular-dev 
* commit '7459dfed6c4353a9437f5c5fbbbc1738f465a432':
  docs: add new UX images for notifications and wear
 2014-07-01 02:52:30 +00:00
Robert Ly
7459dfed6c Merge "docs: add new UX images for notifications and wear" into klp-modular-dev 2014-06-30 22:24:07 +00:00
Robert Ly
bdc5428410 docs: add new UX images for notifications and wear 
Change-Id: I936209db7260c77aec425f3457497cd70a66b767
 2014-06-30 19:33:37 -07:00
Quddus Chong
62395c9379 am 5212ee08: Merge "docs: Add Javadocs for GMS Longhorn." into klp-modular-dev 
* commit '5212ee08f3061c07a6a323e9169b63b596c4c824':
  docs: Add Javadocs for GMS Longhorn.
 2014-06-30 21:51:32 +00:00
Quddus Chong
69fc782a8b am 85a25e02: Merge "docs: Added "What\'s New" for GMS Longhorn (Google Play Services 5.0)" into klp-modular-dev 
* commit '85a25e02004f77595e352e03c1fdb11b6126db69':
  docs: Added "What's New" for GMS Longhorn (Google Play Services 5.0)
 2014-06-30 21:51:28 +00:00
Tim Kilbourn
6f1a231a0b am 326b1857: Merge "Fix docs" into klp-modular-dev 
* commit '326b1857a5ced49f249358751e05ce237bfaefc8':
  Fix docs
 2014-06-30 20:54:30 +00:00
Robert Ly
07fd3652aa am e1e35d13: docs: fix notifications docs 
* commit 'e1e35d13023224c22a54ce074c45d2f8729b1c60':
  docs: fix notifications docs
 2014-06-30 20:17:33 +00:00
Robert Ly
e1e35d1302 docs: fix notifications docs 
Change-Id: I14f55619ae0e0c53811c09410fec5ef8bf577ff6
 2014-06-30 13:11:39 -07:00
Quddus Chong
5212ee08f3 Merge "docs: Add Javadocs for GMS Longhorn." into klp-modular-dev 2014-06-30 17:43:33 +00:00
Brian Carlstrom
c30f36accb Update preloaded-classes for ART DO NOT MERGE 
Change-Id: If0b1bfa2fa1fc80351c11ff2936e1b204539aa64
 2014-06-30 09:30:54 -07:00
Dirk Dougherty
7ec3cf540a am 7ecb89fc: Merge "Change card title for admob." into klp-modular-dev 
* commit '7ecb89fc1e2b07e51dcc52fe6e778855dfb92c15':
  Change card title for admob.
 2014-06-30 01:06:15 +00:00
Dirk Dougherty
d64ac2a67f am 14ec9ade: Merge "Doc change: API diff 20." into klp-modular-dev 
* commit '14ec9adefa1cad0c5444bc938f0edaebaf4d1eee':
  Doc change: API diff 20.
 2014-06-30 01:06:11 +00:00
Robert Ly
c32386ea44 am 4cdf8373: add api 20 
* commit '4cdf83735de741bb44a9078b080dbdaf9db891a0':
  add api 20
 2014-06-30 01:00:08 +00:00
Robert Ly
7b7f68ec94 am 63234bf7: Merge "Revert "add API reference docs filtering for level 20"" into klp-modular-dev 
* commit '63234bf7ab9a05f2e8fb858a31af270ca82b33ad':
  Revert "add API reference docs filtering for level 20"
 2014-06-30 01:00:03 +00:00
Robert Ly
bc2b05299d resolved conflicts for merge of 4d329a8f to klp-modular-dev-plus-aosp 
Change-Id: Id8096712bc63fe16f93dca4a7963440e11087f7a
 2014-06-29 17:55:24 -07:00
Robert Ly
4cdf83735d add api 20 
DO NOT MERGE

Change-Id: Iae685158ac9c08e3a074e36d60004faf995fd1c7
 2014-06-29 16:53:54 -07:00
Robert Ly
05759ef766 am 6fff230d: Merge "docs : fix broken links" into klp-modular-dev 
* commit '6fff230d64b869ec9a3f3bb10ea5ae30b041a85a':
  docs : fix broken links
 2014-06-29 23:42:55 +00:00
Robert Ly
2b906dfb95 am 50b55d61: docs: update notifications docs 
* commit '50b55d61af63098d0b95e38afdc5c381b3373cd6':
  docs: update notifications docs
 2014-06-29 23:42:50 +00:00
Robert Ly
50b55d61af docs: update notifications docs 
Change-Id: I0473c75c31c4012dbb3fc81d155da237f8f1f7fd
 2014-06-29 16:20:28 -07:00
Scott Main
e2af77e635 am 7b5abd15: Merge "docs: fix L Preview G+ links (permanently)" into klp-modular-dev 
* commit '7b5abd15ab15c9f36783dd00c1953d9cf16c33f7':
  docs: fix L Preview G+ links (permanently)
 2014-06-28 02:39:37 +00:00
smain@google.com
fa8e81135a am d2b869d0: revisions to the app structure design guide 
* commit 'd2b869d052e65958545f2dc49c3eef8ff0066280':
  revisions to the app structure design guide
 2014-06-28 02:32:24 +00:00
Robert Ly
49ba77b441 am 4c42ab4b: (-s ours) Merge "Revert "Add api 20 to list used by reference docs."" into klp-modular-dev 
* commit '4c42ab4ba59d75eca4883ece2944c30ca36b760f':
  Revert "Add api 20 to list used by reference docs."
 2014-06-28 02:32:19 +00:00
Robert Ly
684abbb448 am e774eb93: (-s ours) Merge "Add api 20 to list used by reference docs." into klp-modular-dev 
* commit 'e774eb939875c02135c7ce9af8e81322a7c0ab59':
  Add api 20 to list used by reference docs.
 2014-06-28 02:26:16 +00:00
smain@google.com
d2b869d052 revisions to the app structure design guide 
Change-Id: I15e68e454180b848db81791350ba7985817c0930
 2014-06-27 18:43:50 -07:00
smain@google.com
323d0c56aa am 67421351: Merge "fix links to wear downloads" into klp-modular-dev 
* commit '67421351cc6fd99aef741bb3bc2599bcb1288d1d':
  fix links to wear downloads
 2014-06-27 22:57:57 +00:00
Quddus Chong
559c0060bb docs: Add Javadocs for GMS Longhorn. 
Change-Id: I2662b0af0609450364cbcc4666535fd57eec3ce7
 2014-06-27 13:31:17 -07:00
Robert Ly
00a05a902f am 6ebcfb87: docs: notif image 
* commit '6ebcfb87b8111ee7110aeade6fba35e1862528da':
  docs: notif image
 2014-06-27 18:17:19 +00:00
Robert Ly
6ebcfb87b8 docs: notif image 
Change-Id: I2ee3e1da39297f74c8142875c3e71fb0953f5a46
 2014-06-27 11:12:04 -07:00
Robert Ly
b76f6afeca am 137d9da3: Merge "docs: fix images for notifications" into klp-modular-dev 
* commit '137d9da3aab652dccc82f4b5741d1c48b8b6cfe9':
  docs: fix images for notifications
 2014-06-27 18:03:41 +00:00