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

142087 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
9048d47655 am 200e21c5: (-s ours) am 57a85cee: (-s ours) am 77c61120: (-s ours) Import translations. DO NOT MERGE 
* commit '200e21c58996d76eb16e85963ca6c44770f9db05':
  Import translations. DO NOT MERGE
 2014-07-06 18:21:13 +00:00
Baligh Uddin
a6580ffd11 am ca78b88e: (-s ours) am b84a800c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'ca78b88eaa4d8b14d2dc1347f65715d2008e2974':
  Import translations. DO NOT MERGE
 2014-07-06 18:15:28 +00:00
Baligh Uddin
5c07864928 am f6020778: (-s ours) am 562d8cc7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'f6020778cd651dbec3ae907dde7880b4c0ef66c4':
  Import translations. DO NOT MERGE
 2014-07-06 18:15:24 +00:00
Baligh Uddin
5ec98181c1 am 037bcb40: (-s ours) am f617f4d0: (-s ours) Import translations. DO NOT MERGE 
* commit '037bcb4022432b6bee530964ae6b96c8e81c7768':
  Import translations. DO NOT MERGE
 2014-07-06 18:15:20 +00:00
Baligh Uddin
c1f450dc64 am fd5e4617: (-s ours) am f2e29071: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'fd5e46171db33fc2f5dcb6fbfbb6b19e36e9b485':
  Import translations. DO NOT MERGE
 2014-07-06 18:13:04 +00:00
Baligh Uddin
16b3c3750f am 026d5d21: Merge branch \'klp-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-ub-dev 
* commit '026d5d21e1de6ba1a085059bb9a6c959690dc994':
  Import translations. DO NOT MERGE
 2014-07-06 18:12:41 +00:00
Baligh Uddin
ac572525df am e885a9ca: (-s ours) am eb17f6ab: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'e885a9ca9b54aec74dc78de1fab0f2efeb910046':
  Import translations. DO NOT MERGE
 2014-07-06 18:12:38 +00:00
Baligh Uddin
200e21c589 am 57a85cee: (-s ours) am 77c61120: (-s ours) Import translations. DO NOT MERGE 
* commit '57a85ceed620a2c13dfddfbe702a1baee0076343':
  Import translations. DO NOT MERGE
 2014-07-06 18:12:35 +00:00
Baligh Uddin
fd5e46171d am f2e29071: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'f2e29071079ab67d6ed66852f6a6f5d4f1ee8753':
  Import translations. DO NOT MERGE
 2014-07-06 18:08:28 +00:00
Baligh Uddin
026d5d21e1 Merge branch 'klp-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-ub-dev 2014-07-06 18:08:27 +00:00
Baligh Uddin
ca78b88eaa am b84a800c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'b84a800c173d6f6690568b59be0708c8dcb9fb4d':
  Import translations. DO NOT MERGE
 2014-07-06 18:08:20 +00:00
Baligh Uddin
e885a9ca9b am eb17f6ab: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'eb17f6ab69ce9dda043c17827351522a8bcc2613':
  Import translations. DO NOT MERGE
 2014-07-06 18:08:20 +00:00
Baligh Uddin
57a85ceed6 am 77c61120: (-s ours) Import translations. DO NOT MERGE 
* commit '77c6112089e3fb58189b69f56f14b55a94c6b0da':
  Import translations. DO NOT MERGE
 2014-07-06 18:08:17 +00:00
Baligh Uddin
f6020778cd am 562d8cc7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '562d8cc7bc203a03ed20f1dbf25ef5f3f80c4705':
  Import translations. DO NOT MERGE
 2014-07-06 18:08:16 +00:00
Baligh Uddin
037bcb4022 am f617f4d0: (-s ours) Import translations. DO NOT MERGE 
* commit 'f617f4d074886949f48e0f1c507f76d917a7f2b2':
  Import translations. DO NOT MERGE
 2014-07-06 18:08:13 +00:00
Baligh Uddin
ec2bceaa74 am 30a777ef: (-s ours) Import translations. DO NOT MERGE 
* commit '30a777ef5bea16605aea06dd7b545938d019b28f':
  Import translations. DO NOT MERGE
 2014-07-06 18:07:09 +00:00
Craig Mautner
c66da9d606 Merge "[ActivityManager] Prevent kill a restarted process again." 2014-07-06 03:24:06 +00:00
Robert Ly
8f0f930d3b Merge "Fix incorrect link in Android Wear documentation." into klp-modular-dev 2014-07-06 02:28:07 +00:00
Flavio Lerda
474cdf258f Fix incorrect link in Android Wear documentation. 
The link name was misspelled and pointed to the wrong directory.

Change-Id: I471892349dbe3ebbe9ec425a2a78b172d2ec6a0f
 2014-07-06 21:59:06 +00:00
Baligh Uddin
f617f4d074 Import translations. DO NOT MERGE 
Change-Id: Ia07b3b246f397eda9216449403dd283e02f69c42
Auto-generated-cl: translation import
 2014-07-05 15:42:53 -07:00
Baligh Uddin
77c6112089 Import translations. DO NOT MERGE 
Change-Id: I7fc09c4e2f022c81a461d7228727ddc84ad6bb96
Auto-generated-cl: translation import
 2014-07-05 15:40:58 -07:00
Baligh Uddin
30a777ef5b Import translations. DO NOT MERGE 
Change-Id: I75c29be2b22f6cf19a373c4be07f7a8410a14cb1
Auto-generated-cl: translation import
 2014-07-05 15:10:35 -07:00
Nick Kralevich
7bb13f74da am 7228aa10: am 42b74e23: Merge "Typo in method name: Clone" 
* commit '7228aa109aaef18b8447b369ae2a90cecf2c9601':
  Typo in method name: Clone
 2014-07-05 17:22:51 +00:00
Nick Kralevich
812de6f6d7 am dbed61c8: am ca2df286: Merge "Fix typo in the exception message." 
* commit 'dbed61c860367cead2767c66699eaf8c7bba59cf':
  Fix typo in the exception message.
 2014-07-05 17:17:47 +00:00
Nick Kralevich
6b26ded8ce am d05a0743: am a347ece5: Merge "Fix typo in comment of FragmentTransaction" 
* commit 'd05a0743484da59d341792749a3cf35f18a7e11c':
  Fix typo in comment of FragmentTransaction
 2014-07-05 17:17:40 +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
e70766f32a am e1d8ee41: am ce259483: Merge "Added missing brace." 
* commit 'e1d8ee41c0567417c1d0486c0778673cfa9b75ee':
  Added missing brace.
 2014-07-05 17:06:18 +00:00
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