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

141795 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
George Mount
114c68cec4 Merge "Prevent exit transition when a new task was started." 2014-07-06 02:28:07 +00:00
George Mount
ff243289d3 Prevent exit transition when a new task was started. 
Bug 15543793

Change-Id: Id9705009e16da82fe2068f16e167c9cd07696889
 2014-07-07 16:42:44 -07:00
Jorim Jaggi
853b070f19 Add % for battery in expanded QS; make it clickable 
Also removes the "xx minutes until full" label in expanded QS.

Bug: 15392950
Bug: 15863237
Change-Id: I41e85a9ffeb3cba31b58769f8faee9147a3b031e
 2014-07-08 01:38:41 +02:00
Shishir Agrawal
eb2263dd72 Merge "SIM based carrier app privileges." 2014-07-07 18:07:48 +00:00
kmccormick
3b83426718 am 0ed5a556: am 74223986: Doc Update: Add Cloud Save to left nav. 
* commit '0ed5a5563da96df08ccdd6a0da8556317c7b47b6':
  Doc Update: Add Cloud Save to left nav.
 2014-07-07 23:33:52 +00:00
Shishir Agrawal
762d5a091f SIM based carrier app privileges. 
Adding support for SIM based carrier app privileges.

WIP - Missing bits:
- Notifications.
- Certificate check.

Change-Id: Ied3aa6c7d51cc0cde06f5bb58f30893d7a7b1c34
 2014-07-07 16:32:11 -07:00
Alan Viverette
13d965485e Fix build 
Change-Id: I20f3ae19bd6d7cdc6dd6b9e947bdfea38893a167
 2014-07-07 23:30:56 +00:00
Jeff Sharkey
5eb5cffca4 Merge "Gracefully handle apps without native libraries." 2014-07-07 17:47:39 +00:00
Jeff Sharkey
8ffc231d8c Gracefully handle apps without native libraries. 
Bug: 16148014
Change-Id: Ida23545046387b567744ee520baa4713e8403f30
 2014-07-08 09:00:45 -07:00
Christoph Studer
0c69a3e5e8 Remove unused Notification.EXTRA_SCORE_MODIFIED 
Change-Id: I195204e384fc4818ae5980d978518c0e6403f3fb
 2014-07-08 15:48:27 +00:00
John Reck
8360153891 Revert "Fix destroyHardwareResources" 
This reverts commit bac48c4d0c6f71f67074a430cd365ea2e15924b8.

Change-Id: Iba8b729d5e91ca31976fc2bdf9c1dd5fdb19de9a
 2014-07-08 15:44:41 +00:00
Jeff Sharkey
65b1a7c0ba Offer to scan cluster packages at boot. 
Bug: 14975160
Change-Id: Ib637f68354b3d4ce4b5b23d875d8e94ccd497fd2
 2014-07-08 01:04:51 -07:00
Jeff Sharkey
d746057f24 Change new file installs to be cluster-based! 
Now that all the other pieces are in place, we're ready to start
installing new file-based packages as a cluster (the new unified
directory-based layout).  This greatly simplifies the renaming
process.

Also add helper methods to ApplicationInfo to give a much clearer
mapping between it and internal field names, since we can't change
the public API.

Add recursive restorecon().

Bug: 14975160
Change-Id: I72a63c5ddbc594c2fec4a91dd59f73ef253fbfd7
 2014-07-08 00:38:57 -07:00
John Spurlock
e45ceae67f Merge "Include timers in no-interruptions warning, always show." 2014-07-07 19:25:01 +00:00
John Spurlock
d71517be7c Include timers in no-interruptions warning, always show. 
Bug:15831713
Change-Id: I83434d882ba1168bba4de8f1d58334742eb863a3
 2014-07-08 11:40:15 -04: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
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