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

123849 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
28f550f010 am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '03a832669ded18a99d4ac37f047a82d2b198302a':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:25:51 +00:00
Deepanshu Gupta
083af20d9d am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit '531bdb5b57a7a903cea16baedb914e34df941651':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:25:48 +00:00
Deepanshu Gupta
5f56ea8d80 am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit 'f48ab8feec71419e574a2d2f08a29be87743ef07':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:24:25 +00:00
Deepanshu Gupta
8f6a9a658a am 8974a5e6: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '8974a5e6d8408b4cd93f1befb05cc9b654b71e4a':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:23:30 +00:00
Deepanshu Gupta
2ac96a093b am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit 'a0fc1f46264e316449402525fbeb033138ec5f49':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:21:20 +00:00
Deepanshu Gupta
03a832669d am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '08d2007b33838570a96c8df890f0757fa920904c':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:21:12 +00:00
Deepanshu Gupta
f48ab8feec am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '3b7c09b4336f421c489523c10278ecfbfb0708a7':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:21:10 +00:00
Deepanshu Gupta
531bdb5b57 am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit 'fe6f30491f8506a4b2ad895a0f3e68de180e4243':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:21:08 +00:00
Adam Lesinski
7e547e0d72 Merge "Add --pseudo-localize option to generate resources for pseudolocales." 2014-06-03 20:11:13 +00:00
Tim Murray
f0c62b2676 Add support for mixed 32/64 APKs using RenderScript. 
Change-Id: I8901a1547d180c9dcef320f86d07a5b82551fb5c
 2014-06-03 12:30:53 -07:00
Igor Viarheichyk
a191d0464f Add --pseudo-localize option to generate resources for pseudolocales. 
Update help output with new option, remove mention of obsolete zz_ZZ
pseudolocale.

Change-Id: Ie2cfc8d11ef6a57e2b9a2333514a7340a3a8c075
 2014-06-03 12:07:50 -07:00
Andrew Solovay
50cf4a6a30 am aaaa7769: am 9dc2412d: am 47ede834: docs: Fixed alphabetization on Play Store icons page. 
* commit 'aaaa7769139fd1ef683a445c76414f6dcfe07d3b':
  docs: Fixed alphabetization on Play Store icons page.
 2014-06-03 18:06:56 +00:00
Michael Kolb
a4f593d7fb am 576a0d14: Merge "Fix circular mask" into klp-modular-dev 
* commit '576a0d14e19dae9fa6aa50e0bb836a1da793ef21':
  Fix circular mask
 2014-06-03 18:06:25 +00:00
Andrew Solovay
aaaa776913 am 9dc2412d: am 47ede834: docs: Fixed alphabetization on Play Store icons page. 
* commit '9dc2412dfcaa4d5c77ea892c3c1d3d6ea59597dd':
  docs: Fixed alphabetization on Play Store icons page.
 2014-06-03 17:42:05 +00:00
Andrew Solovay
9dc2412dfc am 47ede834: docs: Fixed alphabetization on Play Store icons page. 
* commit '47ede8340b8bd4e5e5c500ddf84b3510dd12c1a0':
  docs: Fixed alphabetization on Play Store icons page.
 2014-06-03 17:38:04 +00:00
Narayan Kamath
00e3c58d02 am 73f7cd98: Merge "Fix build." 
* commit '73f7cd98d61eded2cc3af0f672937c7a2ec5c10a':
  Fix build.
 2014-06-03 14:08:51 +00:00
Narayan Kamath
73f7cd98d6 Merge "Fix build." 2014-06-03 13:56:03 +00:00
Narayan Kamath
26c6c03196 Fix build. 
Bad resolution of a manual rebase.

Change-Id: I56d4c7a343c8fd7a715f983b2db15767849f9af7
 2014-06-03 14:54:52 +01:00
Narayan Kamath
dd2e9d3386 am 7cb13f8a: Merge "Scan for renderscript files before deciding ABIs." 
* commit '7cb13f8a0a40f3d971a953b330f38bfcfb001c5e':
  Scan for renderscript files before deciding ABIs.
 2014-06-03 13:24:50 +00:00
Narayan Kamath
797b109c60 am 7ed98c43: Merge "Add an --abi argument to "pm install"" 
* commit '7ed98c43f8cbcfbb4862205a72455ab39359a011':
  Add an --abi argument to "pm install"
 2014-06-03 13:24:45 +00:00
Narayan Kamath
41aa48beac am 032c5c05: Merge "Log process abis during start." 
* commit '032c5c054c331b63f2d45ee9c497ac852faec633':
  Log process abis during start.
 2014-06-03 13:24:34 +00:00
Narayan Kamath
7cb13f8a0a Merge "Scan for renderscript files before deciding ABIs." 2014-06-03 12:20:05 +00:00
Narayan Kamath
d47e38b634 Scan for renderscript files before deciding ABIs. 
The presence of ".bc" files in an APK implies
incompatibility with any of the 64 bit ABIs.

bug: 14900093

Change-Id: I66ca339a9a149cb3b7e7b349033d80acdeb4140a
 2014-06-03 12:58:35 +01:00
Narayan Kamath
7ed98c43f8 Merge "Add an --abi argument to "pm install"" 2014-06-03 11:10:02 +00:00
Narayan Kamath
6431d11cd4 Add an --abi argument to "pm install" 
This allows callers to force an install to a particular
ABI. This is intended only for testing (and CTS) and is
not meant for usage by the installer package.

Change-Id: Icb1528c0cd35b1aa9323386cb35ff4aaba374fcb
 2014-06-03 11:11:47 +01:00
Narayan Kamath
032c5c054c Merge "Log process abis during start." 2014-06-03 09:57:03 +00:00
Craig Mautner
228742d278 Force all windows to redraw before unblanking screen 
The screen turning on would show windows as they were when the screen
turned off. This fix forces all showing windows to redraw first and
only then allow the screen to turn on.

Fixes bug 15092354.

Change-Id: I349995bf6446d6c462dccdc2b599bab9ab0ab2c8
 2014-06-02 20:29:38 -07:00
Michael Kolb
576a0d14e1 Merge "Fix circular mask" into klp-modular-dev 2014-06-02 21:57:40 +00:00
Andrew Solovay
47ede8340b docs: Fixed alphabetization on Play Store icons page. 
Fixed alphabetization of "Get it on Google Play" section (Afrikans
now correctly comes before Amharic). You can check this at:

http://asolovay.mtv:9053/distribute/tools/promote/badge-files.html

The two bad links (for the "Get it  on Google Play" badges for
Croatian and Hong Kong Chinese) have also been fixed, but to
verify this, you need to go to the live site:

http://developer.android.com/distribute/tools/promote/badge-files.html

bug: 14588953
Change-Id: I71d6ce3c34712ea98e5f9f5cc837c58813dee494
 2014-06-02 12:51:13 -07:00
Mike Lockwood
a0183b02e4 am 8868d129: am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE." 
* commit '8868d1290afd96997fef671f4a7a4c7bbf94fa1a':
  MtpDatabase JNI: Fixed incorrect method name in ALOGE.
 2014-06-02 18:28:51 +00:00
Mike Lockwood
1ac54ec69b am 750e78bb: am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()." 
* commit '750e78bb7626e2e0d5c8feed4a6e4fbe7fe9b5da':
  MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().
 2014-06-02 18:28:42 +00:00
Mike Lockwood
8868d1290a am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE." 
* commit '1c725866da02c3e1f62fb416ea3450caed406f2a':
  MtpDatabase JNI: Fixed incorrect method name in ALOGE.
 2014-06-02 18:25:35 +00:00
Mike Lockwood
750e78bb76 am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()." 
* commit '27eb205e21e7715764084085f382d690e0406c63':
  MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().
 2014-06-02 18:25:28 +00:00
Mike Lockwood
1c725866da Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE." 2014-06-02 18:21:17 +00:00
Mike Lockwood
27eb205e21 Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()." 2014-06-02 18:20:39 +00:00
Andrew Solovay
ec3ade5e8e am 164ecfaa: am be9bf634: am a68757bb: Merge "docs: Added Sony Mobile Communications to the USB Vendor ID table." into klp-docs 
* commit '164ecfaa4106952ab77631353d2a94ae13f3c03a':
  docs: Added Sony Mobile Communications to the USB Vendor ID table.
 2014-06-02 17:02:52 +00:00
Andrew Solovay
164ecfaa41 am be9bf634: am a68757bb: Merge "docs: Added Sony Mobile Communications to the USB Vendor ID table." into klp-docs 
* commit 'be9bf6344c45f68314e3de9e8712c86bd3d0b1e8':
  docs: Added Sony Mobile Communications to the USB Vendor ID table.
 2014-06-02 16:59:43 +00:00
Andrew Solovay
be9bf6344c am a68757bb: Merge "docs: Added Sony Mobile Communications to the USB Vendor ID table." into klp-docs 
* commit 'a68757bb3edfa7b55a349e0b00551a22b6ef9be5':
  docs: Added Sony Mobile Communications to the USB Vendor ID table.
 2014-06-02 16:56:30 +00:00
Andrew Solovay
a68757bb3e Merge "docs: Added Sony Mobile Communications to the USB Vendor ID table." into klp-docs 2014-06-02 16:53:46 +00:00
Dirk Dougherty
ccd1e9e525 Adjust h3 margins for dynamic content blocks. 
Change-Id: I959c4b796792f8900bb46a0afaf2508de017561a
 2014-06-01 21:29:17 -07:00
Martin Blumenstingl
986b46d179 MtpDatabase JNI: Fixed incorrect method name in ALOGE. 
Change-Id: I46688cf79f1e7554b28162df2347c4dcb571b8a9
 2014-05-31 16:17:11 +02:00
Martin Blumenstingl
17a24c58bb MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue(). 
The jstring "stringValue" was not never freed.
In the case where "str" was NULL the whole cleanup part (see "goto out")
was even skipped.
This patch makes getObjectPropertyValue() behave like
getObjectPropertyList().

Change-Id: I5a7ec3611036f5253a054b00064999bcd1d1c29e
 2014-05-31 16:17:11 +02:00
Nick Kralevich
532536f145 am daa0ee13: am 4f8785f2: Merge "SELinuxMMAC additions to perform policy versioning checks." 
* commit 'daa0ee137d43850c834b1ead3f871ceaa49814a7':
  SELinuxMMAC additions to perform policy versioning checks.
 2014-05-31 08:51:05 +00:00
Nick Kralevich
332f35813e am 89b88f22: am 3a9835d4: Merge "Allow SELinuxPolicyInstallReceiver to update new policy files." 
* commit '89b88f226928e269e84100154bc78c0f8dc2016e':
  Allow SELinuxPolicyInstallReceiver to update new policy files.
 2014-05-31 08:49:50 +00:00
Nick Kralevich
daa0ee137d am 4f8785f2: Merge "SELinuxMMAC additions to perform policy versioning checks." 
* commit '4f8785f28e6305d427cc3e483248828c9b9b06a2':
  SELinuxMMAC additions to perform policy versioning checks.
 2014-05-31 05:27:46 +00:00
Nick Kralevich
4f8785f28e Merge "SELinuxMMAC additions to perform policy versioning checks." 2014-05-31 05:25:14 +00:00
Nick Kralevich
89b88f2269 am 3a9835d4: Merge "Allow SELinuxPolicyInstallReceiver to update new policy files." 
* commit '3a9835d4914bc959a37eefecf4d5d0d20852e3e7':
  Allow SELinuxPolicyInstallReceiver to update new policy files.
 2014-05-31 05:09:37 +00:00
Nick Kralevich
3a9835d491 Merge "Allow SELinuxPolicyInstallReceiver to update new policy files." 2014-05-31 05:07:13 +00:00
Elliott Hughes
04c987a806 am 79067b3c: am 5568e0e4: Merge "Move frameworks/base off private libcore.ICU API." 
* commit '79067b3cb2f43e62b9a4d46082fb01cbcc513990':
  Move frameworks/base off private libcore.ICU API.
 2014-05-31 02:29:47 +00:00
Elliott Hughes
79067b3cb2 am 5568e0e4: Merge "Move frameworks/base off private libcore.ICU API." 
* commit '5568e0e45fff7ffe5061770cb527b22d09cf5519':
  Move frameworks/base off private libcore.ICU API.
 2014-05-31 02:26:36 +00:00