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

182992 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
2486f38ad8 Merge "Import translations. DO NOT MERGE" 2015-02-25 15:35:23 +00:00
Geoff Mendal
01dd864ec0 Import translations. DO NOT MERGE 
Change-Id: Ie511cef0bf2d54e3ca9064a2391955b2cf301ddd
Auto-generated-cl: translation import
 2015-02-25 07:33:55 -08:00
Geoff Mendal
bfd3d52867 Merge "Import translations. DO NOT MERGE" 2015-02-25 15:04:42 +00:00
Geoff Mendal
84df2801d4 Import translations. DO NOT MERGE 
Change-Id: I897dff4093f9cce29524a64a9cc4fc08a6655e57
Auto-generated-cl: translation import
 2015-02-25 07:01:14 -08:00
Geoff Mendal
7e90606c69 Merge "Import translations. DO NOT MERGE" 2015-02-25 14:53:13 +00:00
Geoff Mendal
8c010dcaee Import translations. DO NOT MERGE 
Change-Id: Iaf416dc2326ddaf2601b5c37d0e86b2b6fb8e307
Auto-generated-cl: translation import
 2015-02-25 06:46:25 -08:00
Geoff Mendal
ec9382b46d Merge "Import translations. DO NOT MERGE" 2015-02-25 14:42:56 +00:00
Geoff Mendal
7a57388962 Import translations. DO NOT MERGE 
Change-Id: I5e23004d3660fc0ce296391f908e6a042e8da16d
Auto-generated-cl: translation import
 2015-02-25 06:40:41 -08:00
Geoff Mendal
e4bf2eea03 Import translations. DO NOT MERGE 
Change-Id: If17993f8a25da1cb9a868150bb787d8c1b9810bd
Auto-generated-cl: translation import
 2015-02-25 06:25:08 -08:00
Adrian Roos
e377c5011f Merge "Prevent regular processes from accessing the password history" 2015-02-25 13:27:05 +00:00
Keisuke Kuroyanagi
434fcf1588 Merge "Paste as plain text by Ctrl-Shift-V" 2015-02-25 08:00:32 +00:00
Christopher Tate
6a873711cd Merge "Don't crash when backup timeout races with agent completion" 2015-02-25 02:30:37 +00:00
Wale Ogunwale
fa9ec310d8 Merge "Have AMS.setFocusedActivityLocked() move the focus stack to the front" 2015-02-25 01:55:32 +00:00
Christopher Tate
12f783d6c6 Don't crash when backup timeout races with agent completion 
There's a narrow window of time in which an agent reporting that its
operation has completed races with timeouts such that we wind up
handling the completion callback just after certain fundamental state
has been reset.  Detect this race and proceed gracefully instead of
crashing.

Bug 19498669

Change-Id: I5a475527db1a55a8e567366ddfb10112e427682e
 2015-02-24 17:37:54 -08:00
Wale Ogunwale
af0e448859 Have AMS.setFocusedActivityLocked() move the focus stack to the front 
Bug: 19219490
Change-Id: I089c42a6cf6277f5975064103c9804c2ab05dcd6
 2015-02-24 17:37:29 -08:00
Christopher Tate
e266a9f8d1 Merge "Check DUMP permission in the backup service trampoline" 2015-02-25 01:11:34 +00:00
Christopher Tate
8dd7d01c1a Check DUMP permission in the backup service trampoline 
Make sure that even if backup is disabled outright (and hence there
is no underlying service implementation for the trampoline to delegate
to), the DUMP permission exception is thrown as expected.

Bug 19422232

Change-Id: I6d1a17c5f85adcfad75af969b521920e786c05a8
 2015-02-24 15:16:57 -08:00
Chong Zhang
cff41ae363 Merge "MediaRecorder: pass capture fps in float" 2015-02-24 22:22:11 +00:00
Jeff Brown
a9e1c4e540 Merge "To help assess latency, dump the time a broadcast was enqueued." 2015-02-24 20:17:44 +00:00
Michael Wright
273fd8e49b Merge "Clean-up stale inputflinger binaries and associated libs." 2015-02-24 20:17:15 +00:00
Michael Wright
c14c26b3c7 Clean-up stale inputflinger binaries and associated libs. 
Change-Id: I7ea2591e701140430ab2060ae0ce51af114c3acf
 2015-02-24 12:11:37 -08:00
Jeff Brown
9fb3fd1d66 To help assess latency, dump the time a broadcast was enqueued. 
Previously we only dumped the time when a broadcast started dispatch.
Start tracking the time when a broadcast was enqueued so that
we can determine whether the broadcast queue was stalled and for
how long.  Together with other information in the dump, this can help
to ascertain whether broadcast latency is being caused by the sender,
the dispatcher, or the receiver.

Bug: 17695520
Change-Id: I4f2e4bb92f9178f5d095b9124a15eb2e5f13b9f6
 2015-02-24 19:59:16 +00:00
Craig Mautner
5d8a69f277 Merge "Cleanup the activity before the task and stack" 2015-02-24 19:36:08 +00:00
Craig Mautner
acebdc84d1 Cleanup the activity before the task and stack 
The method cleanupActivityLocked() should be called before
removeActivityFromHistoryLocked(). Previously it didn't matter but
now that we null TaskRecord.stack when removing the last activity
from the task it does.

Fixes NPE in bug 19491381.

Change-Id: Ia6f8f560c0fe4df330577f313e24d7dd02c18409
 2015-02-24 11:07:18 -08:00
Wale Ogunwale
9fc3cef1c7 Merge "Added ActivityManager API and AM command to resize a task." 2015-02-24 18:32:57 +00:00
Jorim Jaggi
df4943d5e0 Merge "Do not forceLayout when window is resized" 2015-02-24 18:13:23 +00:00
Jorim Jaggi
690bed268e Change status bar height to 24dp 
Bug: 18410023
Change-Id: Ia8afcaddbf8d78372117806d2b6202cac0364ca9
 2015-02-24 17:35:25 +00:00
Wale Ogunwale
53a29a90f3 Added ActivityManager API and AM command to resize a task. 
Also fixed issue with ActivityStackSupervisor.moveTaskToStackLocked()
functionality not working correctly.

Change-Id: Ia13f1e92a7c59ce6543c226533ac8ea623488290
 2015-02-24 09:33:18 -08:00
John Spurlock
283dbfbd54 Merge "MediaProjectionPermissionActivity: Fix NPE." 2015-02-24 17:20:33 +00:00
John Spurlock
3d332f4e67 MediaProjectionPermissionActivity: Fix NPE. 
Avoid dismissing a null dialog.

Bug: 19492919
Change-Id: I6642bb5194d9818ff3db1266c7c78ed752e23ecf
 2015-02-24 12:14:06 -05:00
Wale Ogunwale
d697ceac02 Improved back button behavior in multi-window mode. 
Pressing the back button on the last activity in a stack that isn't
full screen causes the home stack to move forward and hide all other
visible stacks. This change allows the affected stack to be removed
while keeping the other stack visible.

Bug: 19423645
Change-Id: I30d84f84d525c114ee4993c1e4178af70fe47440
 2015-02-24 08:24:58 -08:00
Adrian Roos
001b00d3bd Prevent regular processes from accessing the password history 
Bug: 19019350
Change-Id: Iee410d62827fe0f9d43e08dd8869e8eea590382f
 2015-02-24 17:16:44 +01:00
James Cook
8ee1d64c0a Merge "Change UndoManager mOwners from HashMap to ArrayMap" 2015-02-24 14:55:51 +00:00
Jason Monk
08238bb624 Merge "Move non-ui bt settings code to SettingsLib" 2015-02-24 13:23:31 +00:00
Jason Monk
fb66b8ff48 Merge "Some Tethering code to SettingsLib and use in QS" 2015-02-24 13:16:27 +00:00
Narayan Kamath
23eeb2b8ae am 287c53f4: am 76507a64: am 72dc62ea: Merge "Track removal of refcounts from FileMap." 
* commit '287c53f4a8bade1cb6c2dd2fe858da9c303e3e3d':
  Track removal of refcounts from FileMap.
 2015-02-24 13:09:55 +00:00
Narayan Kamath
287c53f4a8 am 76507a64: am 72dc62ea: Merge "Track removal of refcounts from FileMap." 
* commit '76507a64b530c757dc284f1f4d0807ffbfd9a701':
  Track removal of refcounts from FileMap.
 2015-02-24 13:04:43 +00:00
Narayan Kamath
76507a64b5 am 72dc62ea: Merge "Track removal of refcounts from FileMap." 
* commit '72dc62ead214bdec5c46d42f4e859b139dba0a00':
  Track removal of refcounts from FileMap.
 2015-02-24 12:56:52 +00:00
Narayan Kamath
72dc62ead2 Merge "Track removal of refcounts from FileMap." 2015-02-24 12:50:57 +00:00
Narayan Kamath
419389c52a am fd335f84: am 948682d1: am 6e208cdd: Merge "Remove wrong javadoc comment" 
* commit 'fd335f8467259410c0a55733331e10531141e76e':
  Remove wrong javadoc comment
 2015-02-24 10:28:12 +00:00
Narayan Kamath
fd335f8467 am 948682d1: am 6e208cdd: Merge "Remove wrong javadoc comment" 
* commit '948682d15f1a4a6676318213a49b50b967cfae27':
  Remove wrong javadoc comment
 2015-02-24 10:18:39 +00:00
Narayan Kamath
948682d15f am 6e208cdd: Merge "Remove wrong javadoc comment" 
* commit '6e208cddad3315c4e38accdb801908b2b9b5cbbd':
  Remove wrong javadoc comment
 2015-02-24 10:11:52 +00:00
Narayan Kamath
6e208cddad Merge "Remove wrong javadoc comment" 2015-02-24 10:04:33 +00:00
Chad Jones
1fb5528643 resolved conflicts for merge of 57bb5f5c to master 
Change-Id: Id5dfe7fc919305658312771a031c0764cef5515c
 2015-02-23 21:19:58 -08:00
Chad Brubaker
39fee05ea2 am f271fa33: am cdc70256: am f3c117ca: Merge "Add new IKeystoreService methods to KeyStore" 
* commit 'f271fa33f148b0c410e8ee06aceb1f2b57cd62c7':
  Add new IKeystoreService methods to KeyStore
 2015-02-24 04:54:41 +00:00
Chad Brubaker
7d0c22e21b am 3576ca1f: am 1629f954: am 598f9b2a: Merge "Add Keymaster 0.4 binder API" 
* commit '3576ca1f9bd1e46101ad940cc5923ac9965cfafe':
  Add Keymaster 0.4 binder API
 2015-02-24 04:54:34 +00:00
Deepanshu Gupta
a13ca400d1 am 01d5286f: am 8f022fd3: am 5ed4fc9e: am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev 
* commit '01d5286f388303551a2eb8f57e210f6d7a690cb5':
  Set forceFramework correctly for included layouts.
 2015-02-24 04:52:35 +00:00
Keisuke Kuroyanagi
b103709d02 Paste as plain text by Ctrl-Shift-V 
Detect Ctrl-Shft-V in onKeyShortcut() and perform paste
as plain text.

Bug: 19287899
Change-Id: I0b27bf6155222a042eeb61dfbd4544c8312904ce
 2015-02-24 12:51:46 +09:00
Alan Viverette
32adbd3524 Merge "Always apply color filter passed to DrawableContainer.setColorFilter" 2015-02-24 01:22:17 +00:00
Alan Viverette
6f51440a74 Always apply color filter passed to DrawableContainer.setColorFilter 
Bug: 19461256
Change-Id: Id44d276739b868e504139cdf767992039f3e4336
 2015-02-23 17:21:24 -08:00