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

196199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
795d95ecd7 Merge "Throw DeadObjectException on failed transaction, not RuntimeException" into mnc-dev 2015-06-29 18:54:58 +00:00
Christopher Tate
ffd5864202 Throw DeadObjectException on failed transaction, not RuntimeException 
In practice we only see failed transactions with small payloads when
the remote dies while the binder operation is in flight.  Throw the
applicable exception type rather than the generic "oops binder went
haywire" one.

Bug 22104446

Change-Id: I785c15617db7a1f4d505aa11f16e61551c8357ba
 2015-06-29 11:52:23 -07:00
Wale Ogunwale
810d5ed23b Merge "Use the correct lock to protect members in PolicyControl" into mnc-dev 2015-06-29 18:13:06 +00:00
Jae Seo
82b3f67711 Merge "Use AlertDialog for MediaRouteControllerDialog" into mnc-dev 2015-06-29 17:14:43 +00:00
Nicolas Prevot
6fd49936ae Merge "Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING" into mnc-dev 2015-06-29 17:08:34 +00:00
Makoto Onuki
cadf3969c3 Merge "Notification for non-adopotable disks shouldn't be snoozed" into mnc-dev 2015-06-29 16:56:09 +00:00
Geoff Mendal
b05e2286a9 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-29 16:50:57 +00:00
Geoff Mendal
cda214a1c3 Import translations. DO NOT MERGE 
Change-Id: Ia7c3e19454b5350971e62e79804cc45512436b98
Auto-generated-cl: translation import
 2015-06-29 09:45:56 -07:00
Jason Monk
435a1dfbd6 Merge "Fix weird case of multi cell icons" into mnc-dev 2015-06-29 16:19:48 +00:00
John Spurlock
f21f1a9158 Merge "Volume Dialog: Fix NPE found in monkey testing." into mnc-dev 2015-06-29 15:50:51 +00:00
John Spurlock
dc005a8965 Volume Dialog: Fix NPE found in monkey testing. 
Bug: 22116033
Change-Id: I34c586ec77bd0d2baae4e84c07afc781cda09ec3
 2015-06-29 11:42:28 -04:00
tiger_huang
cc6366dde1 Use the correct lock to protect members in PolicyControl 
Members in PolicyControl can be accessed by multiple threads via the
public functions called by PhoneWindowManager. Most of the functions
are called with the window-manager-lock held, but reloadFromSetting()
is an exception.

In this patch, we acquire the window-manager-lock before calling
reloadFromSetting() to ensure accessing the members with the same
lock held.

Change-Id: I54ac5cab2a2d74c568fa96145f7a6741c6d99e36
 2015-06-29 08:18:36 -07:00
Jason Monk
8fcab35828 Fix weird case of multi cell icons 
- Don't auto-inflate cell icons
 - Move callback to better time (shouldn't get callbacks before
   setSubs)
 - Fix accidental callback in MobileSignalController constructor
 - Fix subscription listener to run on the right thread to avoid
   the thread issue allowing this bug

Bug: 21504138
Change-Id: Ie1adf8eb05e1042245eead5354b29b314a2e0aae
 2015-06-29 11:00:24 -04:00
Geoff Mendal
e3fc5415ed Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-29 13:59:39 +00:00
Geoff Mendal
3945defe60 Import translations. DO NOT MERGE 
Change-Id: I0a27f1d72cdcad094a9651c223f14e3a928ea2c3
Auto-generated-cl: translation import
 2015-06-29 08:52:39 -05:00
Geoff Mendal
208daa1d76 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-29 13:41:41 +00:00
Geoff Mendal
d38d3e2b1f Import translations. DO NOT MERGE 
Change-Id: Ia1829162e64c53a9c9df9211f41bf29d4e67fd20
Auto-generated-cl: translation import
 2015-06-29 08:40:48 -05:00
Kenny Guy
43904fd5b7 Merge "Revert "Deprecate APIs for admin to create users."" into mnc-dev 2015-06-29 13:28:54 +00:00
Kenny Guy
2703a13f11 Revert "Deprecate APIs for admin to create users." 
This reverts commit ea864c4d4d7ca390d3b67868fd2a640411bff020.

Change-Id: I827e6364b61eeb9e1b2d3205b5e93e10b1df4bfe
 2015-06-29 13:24:24 +00:00
Craig Lafayette
bee7245c69 Merge "Hide MIME_TYPE_PROVISIONING_NFC_V2" into mnc-dev 2015-06-29 12:48:21 +00:00
Kenny Guy
01056b3662 Merge "Deprecate APIs for admin to create users." into mnc-dev 2015-06-29 12:42:21 +00:00
Nicolas Prevot
f1fff79769 Merge "Add flag FLAG_ACTIVITY_RESET_TASK_IF_NEEDED in LauncherAppsService." into mnc-dev 2015-06-29 11:28:13 +00:00
Benjamin Franz
b6fb3fe8f4 Merge "Block assist when screenshots are disabled by policy" into mnc-dev 2015-06-29 10:29:23 +00:00
Niels Egberts
1ea7a81931 Merge "Fix crash with engines that don't override getVoices()." into mnc-dev 2015-06-29 09:34:44 +00:00
Seigo Nonaka
e96b1c6f82 Merge "Fix crash due to reverse selection." into mnc-dev 2015-06-29 03:02:45 +00:00
Sanket Padawe
253cea18fe Merge "Add flag indicating device supporting EAP SIM, AKA & AKA'." into mnc-dev 2015-06-28 02:54:04 +00:00
Xiaohui Chen
44e3a4cbfa Merge "fix temp white list update in device idle" into mnc-dev 2015-06-27 03:58:59 +00:00
Christopher Tate
b035c6d9a6 Merge "Properly scope the "only http/https schemes" intent filter semantics" into mnc-dev 2015-06-27 00:48:10 +00:00
Christopher Tate
2134744efd Properly scope the "only http/https schemes" intent filter semantics 
That restriction applies only to default-app linkage verification, and
not to any general questions of "is this app effectively a web browser?"

Bug 21688029

Change-Id: I9f6a7bc6dcac5e12ee07f8da6465ad51c1aeddfb
 2015-06-26 17:45:22 -07:00
Adam Lesinski
e69e4e1a3a Merge "BatteryStats: Record suspend abort reasons" into mnc-dev 2015-06-27 00:40:25 +00:00
Svetoslav
f73e4644a3 Merge "Update the sensors group label" into mnc-dev 2015-06-27 00:32:13 +00:00
Dianne Hackborn
d5f387bc5f Merge "Looks like MNC is gonna be API 23." into mnc-dev 2015-06-27 00:29:26 +00:00
Svetoslav
b134c16b37 Update the sensors group label 
bug:21784262

Change-Id: Ib316d09d0a16df732bbb367ea6725fa08c08747d
 2015-06-26 16:50:08 -07:00
Anil Muthineni
627bd99ef6 Merge "Write size of operators in writeToParcel()" into mnc-dev 2015-06-26 23:46:41 +00:00
Amit Mahajan
a1c98021c0 am 293facf4: (-s ours) am ad6a2da8: am 2da8a992: am b98f786c: am 5b8976a5: am 853c6178: am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '293facf4bf5b05c043e33589d17df6f1ad1ade26':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 23:40:44 +00:00
Xiaohui Chen
c915eebbf8 fix temp white list update in device idle 
It appears firewall rules for temp white list is updated differently
from the non temp one. The non temp one will trigger a global update
but the temp one is updating only the uids in the list one by one.
The individual uid firewall rule update does not work well with dozable
chain. This cl moves the dozable chain update logic out and put it where
the white list is updated.

BUG:22094135
Change-Id: I425c82da6231b1ef119664907705d0880365f339
 2015-06-26 16:31:43 -07:00
Anil Muthineni
554beb58db Write size of operators in writeToParcel() 
- So that the operators are read correctly while reading
  from parcel.

Bug: 21563489
Change-Id: Icb5571a261144810f075855372791d4291255eec
 2015-06-26 16:31:00 -07:00
Amit Mahajan
293facf4bf am ad6a2da8: am 2da8a992: am b98f786c: am 5b8976a5: am 853c6178: am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit 'ad6a2da84800e47048a8c2a83eeb343cee6aaa9c':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 23:26:27 +00:00
Jorim Jaggi
c154abec43 Merge "Don't apply existing keyguard animation to IME window" into mnc-dev 2015-06-26 23:24:03 +00:00
Dianne Hackborn
2e5cad7868 Looks like MNC is gonna be API 23. 
Change-Id: I9c9c62209c949b1a16ed53eafc259e88e2ddb69a
 2015-06-26 16:15:55 -07:00
Amit Mahajan
ad6a2da848 am 2da8a992: am b98f786c: am 5b8976a5: am 853c6178: am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '2da8a992cb2afc25ac6df84da449944ea08f0c57':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 23:12:05 +00:00
Amit Mahajan
37b4546ec0 am 1573d8ef: (-s ours) am d98e7c1d: am 7278b043: am 895eb134: am 90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '1573d8efb2ac6a1a2e2a057041200633df2a9717':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 23:12:03 +00:00
Rich Slogar
cea2b1c725 am 76e42bdd: am 3686e043: am 268a7c19: am fc7e84b3: Merge "docs: manifest merger updates" into lmp-docs 
* commit '76e42bdd05f6defa283f9df12966928328680445':
  docs: manifest merger updates
 2015-06-26 23:06:59 +00:00
Prashant Malani
b29eeb5af1 am b3d02465: am 9a3eacbe: Merge "Revert "Always re-establish kernel alarms when considering new alarm set"" into cw-d-mr1-dev 
* commit 'b3d02465f859dbe62b14c787c7de966abd6c7381':
  Revert "Always re-establish kernel alarms when considering new alarm set"
 2015-06-26 23:06:53 +00:00
Robert Schaub
71647af1ee am cf05e318: am 2a1be1bc: Docs: Added declaration to code fragment Bug: 21030774 
* commit 'cf05e31866e94eb9d8a6f0ee1fb9960ba169e2c1':
  Docs: Added declaration to code fragment Bug: 21030774
 2015-06-26 22:58:37 +00:00
Wei Liu
0adc5f3794 am 83467228: am 6f6326bc: Implement a exponential backoff for NTP time and XTRA data retry. 
* commit '834672285050812d08cd173559382bc5c3e9800a':
  Implement a exponential backoff for NTP time and XTRA data retry.
 2015-06-26 22:58:31 +00:00
Rich Slogar
52d82d7ea9 am 32279219: am fd3b64b8: am b0afc540: docs: Eclipse ADT end-of-life note 
* commit '3227921922b3750e04e309b7cacd55d5f0b5b77d':
  docs: Eclipse ADT end-of-life note
 2015-06-26 22:58:20 +00:00
Rich Slogar
da420f3d79 am 4c96c704: am 7d377c3b: am fa5f184f: docs: studio migration guide 
* commit '4c96c7045e7e4efbf4f7b68f8e3d02a5e9272075':
  docs: studio migration guide
 2015-06-26 22:58:12 +00:00
Sanket Padawe
fdadadba2e Add flag indicating device supporting EAP SIM, AKA & AKA'. 
Bug: 22014309
Change-Id: Ia76507f9fbe607a7cbec126c527840806c0e7851
 2015-06-26 15:57:07 -07:00
Amit Mahajan
1573d8efb2 am d98e7c1d: am 7278b043: am 895eb134: am 90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit 'd98e7c1df774eb86a67310f5cbc0dbdd91f33c19':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 22:55:47 +00:00