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

120415 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
f7d6925ee7 am 7850f95d: Merge "Allow 3 letter language codes in InputMethodUtils." 
* commit '7850f95dc55c4e4801cf145c42a1bc98b49a87d6':
  Allow 3 letter language codes in InputMethodUtils.
 2014-07-14 08:52:55 +00:00
Christopher Tate
f908b61abf am ef3b35b4: Merge "Logging in LocalTransport on as default" 
* commit 'ef3b35b48c31919a7d6977e41db7f9d37654dec3':
  Logging in LocalTransport on as default
 2014-07-11 01:44:36 +00:00
Colin Cross
d01adef1ba am 1f060a17: Merge "GpsLocationProvider: look for config file in /etc/gps.<ro.hardware.gps>.conf" 
* commit '1f060a178d9e69f8c08ccad5d7e0ef8fb22ddf8e':
  GpsLocationProvider: look for config file in /etc/gps.<ro.hardware.gps>.conf
 2014-07-11 01:44:31 +00:00
Narayan Kamath
7850f95dc5 Merge "Allow 3 letter language codes in InputMethodUtils." 2014-07-10 20:18:52 +00:00
Narayan Kamath
7be75338a3 Allow 3 letter language codes in InputMethodUtils. 
Replace locale.substring(0, 2) with a function that always
returns the first component of the locale (assumed to be the
language).

bug: 10090157

(cherry picked from commit cefc79c6b18bb2e824c299e7b9e212071e5ebc43)

Change-Id: I56b02dd0c6dc222daa3ceade841a30879449bb4a
 2014-07-14 09:42:55 +01:00
Christopher Tate
ef3b35b48c Merge "Logging in LocalTransport on as default" 2014-07-10 17:35:34 +00:00
Henrik Baard
2db2b9aa36 Logging in LocalTransport on as default 
The logging is LocalTransport.java is enabled by
default.

Change default to false to remove logs, as this class
states that it is only for debug.

Change-Id: Iae63c7b62edbd503c606f0aee671a9579e78843d
 2014-07-10 08:46:39 +02:00
Colin Cross
1f060a178d Merge "GpsLocationProvider: look for config file in /etc/gps.<ro.hardware.gps>.conf" 2014-07-10 00:35:03 +00:00
Stephen Hines
8348c35165 am 4fea742c: Merge "Update copyFrom(BaseObj[]) for large objects." 
* commit '4fea742c07d2d55f29b7d61078914c5f83817313':
  Update copyFrom(BaseObj[]) for large objects.
 2014-07-10 00:16:44 +00:00
Elliott Hughes
3964ea4675 am d74f99d3: Merge "Switch frameworks/base/libs/androidfw to the new icu." 
* commit 'd74f99d390d9a0e1c800ee68b1bc39c210aca989':
  Switch frameworks/base/libs/androidfw to the new icu.
 2014-07-10 00:08:33 +00:00
Elliott Hughes
f072fda13f am effcc83e: Merge "Switch frameworks/base/core/jni to the new icu." 
* commit 'effcc83e42638a5fa7eceaebe22081a1b9eaebaf':
  Switch frameworks/base/core/jni to the new icu.
 2014-07-10 00:08:29 +00:00
Elliott Hughes
effcc83e42 Merge "Switch frameworks/base/core/jni to the new icu." 2014-07-09 22:27:32 +00:00
Elliott Hughes
92b1896dfd Switch frameworks/base/core/jni to the new icu. 
Change-Id: Id12ce02da377ce78f318e10633c47f500237d9d9
 2014-07-09 16:56:11 -07:00
Robin Lee
1f0180bfa8 am 74803e55: Merge "Make misc config directory during user creation" 
* commit '74803e559caffe235b86dc52cf76ef98343c0d74':
  Make misc config directory during user creation
 2014-07-09 17:39:13 +00:00
Stephen Hines
4fea742c07 Merge "Update copyFrom(BaseObj[]) for large objects." 2014-07-09 14:45:53 +00:00
Tim Murray
31e12acca5 Update copyFrom(BaseObj[]) for large objects. 
Change-Id: I99cadbd1ad925cad0dd357c9abbd1a49c07785c9
 2014-07-09 17:09:33 -07:00
Elliott Hughes
d74f99d390 Merge "Switch frameworks/base/libs/androidfw to the new icu." 2014-07-09 14:45:53 +00:00
Elliott Hughes
6a4deeda70 Switch frameworks/base/libs/androidfw to the new icu. 
Change-Id: Id82830750dd7e83bbc66811a1133b403cc697c97
 2014-07-09 16:58:28 -07:00
Brian Carlstrom
5aba0149b9 am b85afb38: Merge "Make dex2oat heap size product configurable [frameworks/base]" 
* commit 'b85afb38e88ceca61af2855e30d34bc6ec4d32d9':
  Make dex2oat heap size product configurable [frameworks/base]
 2014-07-09 12:21:54 +00:00
Brian Carlstrom
b85afb38e8 Merge "Make dex2oat heap size product configurable [frameworks/base]" 2014-07-08 22:56:31 +00:00
Brian Carlstrom
6d77eb99bf Make dex2oat heap size product configurable [frameworks/base] 
Bug: 15919420
Change-Id: I9b7b4f60826fc9b0cc6bb3765ceaa36542425006
 2014-07-08 15:05:41 -07:00
Stephen Hines
957ec05ef6 am 70a3c558: Merge "Adds support for multi-input kernels to Frameworks/Base/RS." 
* commit '70a3c558645f8e693ce37577fdd61b8d1fd4ed9a':
  Adds support for multi-input kernels to Frameworks/Base/RS.
 2014-07-08 21:25:19 +00:00
Robert Greenwalt
a7efe9b874 am 912700fc: Merge "Add Telefonica/Movistar specific APN details for dun" 
* commit '912700fca8e02fe93fca7d95ef22472f77349ffe':
  Add Telefonica/Movistar specific APN details for dun
 2014-07-08 16:59:17 +00:00
Craig Mautner
6d6d218962 am 08881385: Merge "[ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager." 
* commit '08881385a86bf887669a555ae03759c374ec9c50':
  [ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager.
 2014-07-07 21:19:45 +00:00
Brian Carlstrom
044492e1b7 am 52a154fe: Merge "Remove" 
* commit '52a154febb7c06b142116235c368417dd5e542ba':
  Remove
 2014-07-07 20:55:16 +00:00
Robert Greenwalt
912700fca8 Merge "Add Telefonica/Movistar specific APN details for dun" 2014-07-07 19:33:32 +00:00
Albert
b2df39a709 Add Telefonica/Movistar specific APN details for dun 
Movistar Spain needs to add a specific APN to offer tethering
in their devices.

Change-Id: I5554ff98a5ac4c5f33b9af0083e1fac8305c9e13
Signed-off-by: Albert <alberto.crespell@gmail.com>
 2014-07-08 06:56:08 +02:00
Stephen Hines
70a3c55864 Merge "Adds support for multi-input kernels to Frameworks/Base/RS." 2014-07-07 17:50:18 +00:00
Chris Wailes
949610653f Adds support for multi-input kernels to Frameworks/Base/RS. 
* Added a new JNI call to pass arrays of Allocations to the RS runtime.
* Added a new version of ForEach that takes an array of Allocations.
* Added some casts to disambiguate existing calls to forEach.

Change-Id: I46d2834c37075b2a2407fd8b010546818a4540d1
 2014-07-07 12:27:21 -07:00
Brian Carlstrom
52a154febb Merge "Remove" 2014-07-07 17:50:18 +00:00
Brian Carlstrom
87f597465c Remove 
(cherry picked from commit 9881203920c8445e9a4bdd9e4a90ba0014f34c5e)

Change-Id: Ib40823b7c03af4c71da902b0e5c504e074cf0dd9
 2014-07-07 11:31:47 -07:00
Craig Mautner
a7f02a5cda am ef2e7667: Merge "[ActivityManager] Avoid keeping restarting home when only home activity exists." 
* commit 'ef2e76675a6c60a2a4764a2e19fdb2c4d9beb00e':
  [ActivityManager] Avoid keeping restarting home when only home activity exists.
 2014-07-07 17:23:06 +00:00
Craig Mautner
09c1af5d5c am c66da9d6: Merge "[ActivityManager] Prevent kill a restarted process again." 
* commit 'c66da9d606fa3091540bc4c51c2904cc949bf777':
  [ActivityManager] Prevent kill a restarted process again.
 2014-07-07 15:36:33 +00:00
Craig Mautner
7611a5d328 am 5acdd0f6: Merge "[ActivityManager] Ensure alive process is not killedByAm." 
* commit '5acdd0f67db9b5f41a89dfb5200f37d6f5f984ec':
  [ActivityManager] Ensure alive process is not killedByAm.
 2014-07-07 15:00:47 +00:00
Narayan Kamath
e084942321 am 501bb0a5: Merge "Fix issue when converting fil->tl." 
* commit '501bb0a5e4a62a9e58efe2fa0a3f275c193872e7':
  Fix issue when converting fil->tl.
 2014-07-07 08:57:04 +00:00
Craig Mautner
c66da9d606 Merge "[ActivityManager] Prevent kill a restarted process again." 2014-07-06 03:24:06 +00:00
Nick Kralevich
7228aa109a am 42b74e23: Merge "Typo in method name: Clone" 
* commit '42b74e231d893f553e4e8c88641e056ebcf82ac5':
  Typo in method name: Clone
 2014-07-05 17:16:59 +00:00
Nick Kralevich
dbed61c860 am ca2df286: Merge "Fix typo in the exception message." 
* commit 'ca2df28678352ea72cfb8a680796d0a908b2453b':
  Fix typo in the exception message.
 2014-07-05 17:11:47 +00:00
Nick Kralevich
d05a074348 am a347ece5: Merge "Fix typo in comment of FragmentTransaction" 
* commit 'a347ece5a77d4b695af6255d751d98dbb519ad74':
  Fix typo in comment of FragmentTransaction
 2014-07-05 17:11:42 +00:00
Nick Kralevich
e1d8ee41c0 am ce259483: Merge "Added missing brace." 
* commit 'ce2594832593dbf0d9d03f83054cabc9429261fa':
  Added missing brace.
 2014-07-05 17:03:50 +00:00
Nick Kralevich
664ec0a6e6 am 77491ac0: Merge "Correct typo in doc comment" 
* commit '77491ac00c18cd81328a3942c78a64436be65618':
  Correct typo in doc comment
 2014-07-05 17:03:45 +00:00
Nick Kralevich
f397f6f10d am a2e4ce2b: Merge "Fix typo - issue 56671" 
* commit 'a2e4ce2b7cab301f8bde5e4747be5dd85e899a63':
  Fix typo - issue 56671
 2014-07-05 16:59:56 +00:00
Nick Kralevich
c43f3eb67b am 8b333467: Merge "fix trivial typo: s/meansure/measure" 
* commit '8b333467fea995d9cec72dddfcba8fa19363ee32':
  fix trivial typo: s/meansure/measure
 2014-07-05 16:59:51 +00:00
Nick Kralevich
d92ab153a3 am a6336747: Merge "Fix a copy/paste typo in ViewPropertyAnimator" 
* commit 'a6336747a42fa5b64f82b7fe57ddf614d1fda9b2':
  Fix a copy/paste typo in ViewPropertyAnimator
 2014-07-05 16:52:11 +00:00
Nick Kralevich
3b4c2c982e am 63af727b: Merge "Fix Issue 59989" 
* commit '63af727b4b2e05ca18f1d9f5c8b4e87a6bfd5601':
  Fix Issue 59989
 2014-07-05 16:45:36 +00:00
Nick Kralevich
23219098a6 am b70888d4: Merge "Fix a typo in a javadoc comment" 
* commit 'b70888d45573c015fbb9d584df575bf78f5e9684':
  Fix a typo in a javadoc comment
 2014-07-05 16:45:31 +00:00
Nick Kralevich
dbb32da844 am c9eff23b: Merge "Fix typo in DevicePolicyManager documentation" 
* commit 'c9eff23b443f26fb8c4873a6ecb61eded0564163':
  Fix typo in DevicePolicyManager documentation
 2014-07-05 16:45:26 +00:00
Nick Kralevich
58005ec545 am 3b345a6f: Merge "Fix javadoc typo in Message.java: "arg1" -> "arg2"" 
* commit '3b345a6f9103c1677a696b4770cc318df45cdcaa':
  Fix javadoc typo in Message.java: "arg1" -> "arg2"
 2014-07-05 16:35:13 +00:00
Nick Kralevich
aa4ff2efec am eb822cec: Merge "Typo fix in permission string" 
* commit 'eb822cecdb128cb0a00f361b87b8378d5664a458':
  Typo fix in permission string
 2014-07-05 16:22:17 +00:00
Craig Mautner
08881385a8 Merge "[ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager." 2014-07-05 03:01:43 +00:00