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

142108 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Kralevich
50c3c11460 am 664ec0a6: am 77491ac0: Merge "Correct typo in doc comment" 
* commit '664ec0a6e6cedf47adc54f2e0cd8f1435d699b72':
  Correct typo in doc comment
 2014-07-05 17:06:11 +00:00
Nick Kralevich
3a62327631 am f397f6f1: am a2e4ce2b: Merge "Fix typo - issue 56671" 
* commit 'f397f6f10dc1d99182bc3903d4e3751d348a3320':
  Fix typo - issue 56671
 2014-07-05 17:06:04 +00:00
Nick Kralevich
7ea31c67f7 am c43f3eb6: am 8b333467: Merge "fix trivial typo: s/meansure/measure" 
* commit 'c43f3eb67bbf60af61b3cd18bc5b6a684c8744c6':
  fix trivial typo: s/meansure/measure
 2014-07-05 17:05:58 +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
89c9c67a33 am d92ab153: am a6336747: Merge "Fix a copy/paste typo in ViewPropertyAnimator" 
* commit 'd92ab153a3a33dcd1304661a9929112ab0b40d5a':
  Fix a copy/paste typo in ViewPropertyAnimator
 2014-07-05 16:56:47 +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
0f59f9e7cf am 3b4c2c98: am 63af727b: Merge "Fix Issue 59989" 
* commit '3b4c2c982ef4ac681929678288ce042e4c0a5be6':
  Fix Issue 59989
 2014-07-05 16:51:45 +00:00
Nick Kralevich
3d24150dbb am 23219098: am b70888d4: Merge "Fix a typo in a javadoc comment" 
* commit '23219098a6d623cf1825d8fd9a8d200cdc06aab9':
  Fix a typo in a javadoc comment
 2014-07-05 16:51:38 +00:00
Nick Kralevich
3cdc06bb37 am dbb32da8: am c9eff23b: Merge "Fix typo in DevicePolicyManager documentation" 
* commit 'dbb32da844cf8ed65d0b5005276a86aad7c81853':
  Fix typo in DevicePolicyManager documentation
 2014-07-05 16:51:32 +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
3e5f0229e1 am 58005ec5: am 3b345a6f: Merge "Fix javadoc typo in Message.java: "arg1" -> "arg2"" 
* commit '58005ec545fd011418b6400a3b377fea6928c933':
  Fix javadoc typo in Message.java: "arg1" -> "arg2"
 2014-07-05 16:40:59 +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
569172e2da am aa4ff2ef: am eb822cec: Merge "Typo fix in permission string" 
* commit 'aa4ff2efecb1aa03b6a6843bf8a4c19b885db4fc':
  Typo fix in permission string
 2014-07-05 16:27:14 +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
riddle_hsu
7f1e3f3e93 [ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager. 
Sympton:
When application crash in a special timing and system server's InputMethodManager is binding, deadlock may occur.

Root Cause:
Thread(1): When using InputMethodManager in system server, it will lock mH(handler) of InputMethodManager,
and sometimes it will call to InputMethodManagerService::showCurrentInputLocked and will call bindService at some condition,
then it will also lock ActivityManagerService.
Thread(2): When an application crashed, it will lock ActivityManager when showing crash dialog, inside the dialog,
it will call setEnabled of Button and lock mH of InputMethodManager.setEnable of TextView will lock IMM's handler.
So the deadlock happened as the flow: (2) lock AMS -> (1)lock mH -> (2)wait mH -> (1) wait AMS

Solution:
Reduce nested lock of error dialog: post message to let (2) lock mH after release AMS lock.

Change-Id: Id85c29406236db3b5fca9655fde1fcaf0afd1337
 2014-07-08 04:30:19 +08:00
Baligh Uddin
274a6049ed Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 2014-07-05 02:59:43 +00:00
Baligh Uddin
e6f60bf55c Import translations. DO NOT MERGE 
Change-Id: Icdc14f6d978d7a4efc32326b9e40cabd8133e342
Auto-generated-cl: translation import
 2014-07-05 14:04:26 -07:00
Baligh Uddin
314bfe0710 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-07-05 02:59:43 +00:00
Baligh Uddin
6024630882 Import translations. DO NOT MERGE 
Change-Id: I4a6f893b2d7157b8d7d70cb41a5b9c75043342dc
Auto-generated-cl: translation import
 2014-07-05 09:20:43 -07:00
Baligh Uddin
ab157d740e Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2014-07-05 02:59:43 +00:00
Baligh Uddin
54cf94137e Import translations. DO NOT MERGE 
Change-Id: I99893089a51a6984d44db22628dccc90b0867faf
Auto-generated-cl: translation import
 2014-07-05 09:30:04 -07:00
Baligh Uddin
43ba3ba479 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-07-05 02:59:43 +00:00
Baligh Uddin
01cad39548 Import translations. DO NOT MERGE 
Change-Id: I870d8d23d6d1923dcfa118d151e26bf9b7a8f86e
Auto-generated-cl: translation import
 2014-07-05 09:27:47 -07:00
Baligh Uddin
b4600e793b Merge "Import translations. DO NOT MERGE" into klp-dev 2014-07-05 02:59:43 +00:00
Baligh Uddin
4927253e02 Import translations. DO NOT MERGE 
Change-Id: I99d859070b0a2d65c9e57556f7ccc0b4dfb3a995
Auto-generated-cl: translation import
 2014-07-05 09:44:21 -07:00
Baligh Uddin
f1c1e725ec Merge "Import translations. DO NOT MERGE" into klp-dev 2014-07-05 02:59:43 +00:00
Baligh Uddin
4430714771 Import translations. DO NOT MERGE 
Change-Id: I2898d53a3f6bf4fc920fa8c3bc122d00aa879d18
Auto-generated-cl: translation import
 2014-07-05 14:00:41 -07:00
Baligh Uddin
add3fb664a Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2014-07-05 02:59:43 +00:00
Baligh Uddin
bc3bd6c3e4 Import translations. DO NOT MERGE 
Change-Id: Ie1868681bbc06d89a0695863e9146cd2ee85a5de
Auto-generated-cl: translation import
 2014-07-05 14:10:06 -07:00
Baligh Uddin
1ae374d95d Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 2014-07-05 02:59:43 +00:00
Baligh Uddin
99c686ba21 Import translations. DO NOT MERGE 
Change-Id: If81d0c4fa3f54f621472e3b188fa9b3fce8c38f2
Auto-generated-cl: translation import
 2014-07-05 15:34:02 -07:00
Baligh Uddin
ad0d4f8456 Import translations. DO NOT MERGE 
Change-Id: I767513b0d247eb29325b3e512e2b95e720152570
Auto-generated-cl: translation import
 2014-07-05 15:13:27 -07:00
David Friedman
42fcd1463d Change list for NDK Revision 10. Staged at: 
http://boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html

Change-Id: I8c66a209f3fa86cb9743b193d20b2114aa6a0ee4
 2014-07-04 11:40:19 -07:00
Narayan Kamath
2d067babdb am 29a9d27d: am 358a3f71: Merge "fix AudioTrack and AudioRecord JNI" 
* commit '29a9d27d3c9224a7709a41096d7a958c8177ac19':
  fix AudioTrack and AudioRecord JNI
 2014-07-04 09:23:55 +00:00
Narayan Kamath
0cf2e65dc0 am 5ae312fb: am 759e0d6a: Merge "Fix LocalePicker locale filtering." 
* commit '5ae312fb5b601d2c60e197f94c6a292700776140':
  Fix LocalePicker locale filtering.
 2014-07-04 09:22:57 +00:00
Narayan Kamath
29a9d27d3c am 358a3f71: Merge "fix AudioTrack and AudioRecord JNI" 
* commit '358a3f716850e96716b766c63d50d3425a4c9ed7':
  fix AudioTrack and AudioRecord JNI
 2014-07-04 08:49:02 +00:00
Narayan Kamath
5ae312fb5b am 759e0d6a: Merge "Fix LocalePicker locale filtering." 
* commit '759e0d6a7a258dbc34a38a7db320827eb9144487':
  Fix LocalePicker locale filtering.
 2014-07-04 08:48:58 +00:00
Narayan Kamath
501bb0a5e4 Merge "Fix issue when converting fil->tl." 2014-07-04 08:02:36 +00:00
Narayan Kamath
fec5106c8e Fix issue when converting fil->tl. 
We should call ResourceTable::getLocales directly,
and not AssetManager::getLocales. The latter will convert
"tl" to "fil" so we'll end up thinking we have resources
for "fil" when we don't really have any.

bug: 15873165

Change-Id: I9753e4608aaecede328a40ee1f3ee6b016d0dedc
 2014-07-07 09:51:01 +01:00
Narayan Kamath
759e0d6a7a Merge "Fix LocalePicker locale filtering." 2014-07-04 08:02:36 +00:00
riddle_hsu
a4f1f8a239 [ActivityManager] Prevent kill a restarted process again. 
Root Cause:
Use removeTask with flag ActivityManager.REMOVE_TASK_KILL_PROCESS will set waitingToKill = "remove task"
to the target process when its setSchedGroup is not BG_NONINTERACTIVE.
Later the target process may be killed when applying oom-adj due to setSchedGroup has changed to BG_NONINTERACTIVE.
If the process is needed to restart, the process record will be resued.
Then the restarted process may be killed again because its waitingToKill is not null.

Solution:
Clean waitingToKill when process is dead.

Change-Id: I5ffb5388127f4221da4c700d3f1c224f7ca6e7b2
 2014-07-04 12:19:41 +08:00
Narayan Kamath
80b574199c Fix LocalePicker locale filtering. 
This was broken by commit b27c137087ee92674 which
removed a badly phrased check. Prior to that commit,
there was a check that excluded locales whose toString()
length was not 5.

This change reinstates that check in a less roundabout
way, by excluding BCP-47 tags that don't have a country
subtag.

bug: 16038949

Change-Id: Ic24b1df87b2e2ce47d9ae04c7759088721f27b4f
 2014-07-03 13:31:42 +01:00
Brian Duff
51d70ce9b8 am c542745e: am a6e9dd3f: Merge "Fix a typo in NumberPicker javadoc." 
* commit 'c542745e23fe9d2e71c1f607d66f5570f585133d':
  Fix a typo in NumberPicker javadoc.
 2014-07-03 09:43:56 +00:00
Brian Duff
c542745e23 am a6e9dd3f: Merge "Fix a typo in NumberPicker javadoc." 
* commit 'a6e9dd3f9a2d966faf2d1710d2189127b968dc52':
  Fix a typo in NumberPicker javadoc.
 2014-07-03 06:45:04 +00:00