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

148009 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
10ab095a5b Minor restore fixes 
1. We were missing a 'break' in the session-timeout case of
   message dispatch, so were falling through into a different
   case.  Oops.  Fortunately it was benign; the other case's
   logic was merely logging "hey it doesn't look like there's
   anything to do here" and cleanly exiting.

2. After a restore operation finishes we were previously
   always leaving the session timeout clock running.  However,
   this was not appropriate in the case of restore-at-install,
   when the restore was a one-shot kicked off by the package
   manager rather than an operation on an ongoing RestoreSession.
   That logic now properly tidies up the session timeout when
   winding up the restore in either situation.

Bug 17080648

Change-Id: I51d4a50db4feefc4c355230a3bfb926ea2fb5944
 2014-08-18 22:01:43 +00:00
Adam Lesinski
71809ee7f6 Include build number in aapt version 
Teams are constantly confused over which version of aapt
they are running. Include the build number from the
Android build system in the binary. Can be retrieved by executing
'aapt version'.

Change-Id: Ie4692fb160c7cbe720a8e76b73e435170214fe0e
 2014-08-18 21:08:15 +00:00
Andy Hung
2aaed141fa Merge "Fix 48kHz limitation on AudioTrack" into lmp-dev 2014-08-16 04:32:18 +00:00
Andy Hung
70b395e8c1 Fix 48kHz limitation on AudioTrack 
Changed to 96kHz.

Bug: 12979141
Bug: 17069369
Change-Id: I7643901f6d365d8b46da4872bd2266ec20cb0339
 2014-08-18 11:25:22 -07:00
Chris Craik
d077d777b3 Merge "Fix BitmapDrawable outline crash" into lmp-dev 2014-08-16 03:56:00 +00:00
Ricardo Cervera
20ae7b7cb6 am cce5036c: am 88a1f40c: am fb1f5bde: docs: Removing radio from music intents 
* commit 'cce5036cb00c7e25f1d226c6405e6231f5913444':
  docs: Removing radio from music intents
 2014-08-18 19:49:12 +00:00
Ricardo Cervera
cce5036cb0 am 88a1f40c: am fb1f5bde: docs: Removing radio from music intents 
* commit '88a1f40c5d6111c74feb8e3022ffdccbf489a2e4':
  docs: Removing radio from music intents
 2014-08-18 19:38:16 +00:00
Ricardo Cervera
88a1f40c5d am fb1f5bde: docs: Removing radio from music intents 
* commit 'fb1f5bdef03844547152f921dcaa044269b5a0cb':
  docs: Removing radio from music intents
 2014-08-18 19:28:02 +00:00
Ricardo Cervera
fb1f5bdef0 docs: Removing radio from music intents 
Change-Id: Iaf645d692b247994dd8c12835c387ff296b26019
 2014-08-18 12:13:04 -07:00
Chris Craik
9745de0f05 Fix BitmapDrawable outline crash 
bug:17103753

Change-Id: Ia3d2c7d61b3f3b9ea8879f941d726d8627e155bb
 2014-08-18 11:32:13 -07:00
Adrian Roos
49e057d7ee Play "device trusted" sound when onTrustInitiatedByUser fires 
Bug: 16840500
Change-Id: I73fbe5c2cff665ccb637abb9039d57f377d9df53
 2014-08-18 16:53:27 +00:00
Ricardo Cervera
f960409f3b am 72ca94ee: am d0842384: docs: Updated links for Android Studio 0.8.6 
* commit '72ca94ee29c71541b7628c44f44ef5cddff9a6e9':
  docs: Updated links for Android Studio 0.8.6
 2014-08-18 16:49:18 +00:00
Ricardo Cervera
72ca94ee29 am d0842384: docs: Updated links for Android Studio 0.8.6 
* commit 'd0842384cb9d6a19f129434457c88de64f2b0b06':
  docs: Updated links for Android Studio 0.8.6
 2014-08-18 16:40:01 +00:00
Ricardo Cervera
d0842384cb docs: Updated links for Android Studio 0.8.6 
Change-Id: Ic01263930b94232445704c03854414bd07ca4c33
 2014-08-18 09:03:59 -07:00
Deepanshu Gupta
da9baa15bf am d519f742: am b6c923a2: am 59eedf52: Layoutlib: Update wifi and battery icon for KK 
* commit 'd519f7424fd2faad371e7678b3dc11114fa5222f':
  Layoutlib: Update wifi and battery icon for KK
 2014-08-16 06:04:07 +00:00
Deepanshu Gupta
d519f7424f am b6c923a2: am 59eedf52: Layoutlib: Update wifi and battery icon for KK 
* commit 'b6c923a2dfd86eb56a8f83d5a27f21996331e436':
  Layoutlib: Update wifi and battery icon for KK
 2014-08-16 05:53:49 +00:00
Deepanshu Gupta
b6c923a2df am 59eedf52: Layoutlib: Update wifi and battery icon for KK 
* commit '59eedf528ca29a32b6d7f358f5076929f8fbb164':
  Layoutlib: Update wifi and battery icon for KK
 2014-08-16 05:45:42 +00:00
John Spurlock
c9ae305b56 Merge "Temporary workaround for NetworkOverLimitActivity dialog." into lmp-dev 2014-08-16 04:32:18 +00:00
John Spurlock
cf008884a9 Temporary workaround for NetworkOverLimitActivity dialog. 
Remove the window type, since it now crashes SystemUI.

Bug:17102499
Change-Id: I69230242e27150f9e38822b5cd3745caae108287
 2014-08-18 15:14:48 -04:00
John Spurlock
9a888b9be1 Merge "QS: Add scanning progress state indication." into lmp-dev 2014-08-16 04:32:18 +00:00
John Spurlock
465cefa1a2 QS: Add scanning progress state indication. 
- Create a modified version of the new platform horizontal
indeterminate progress indicator, and align it to the bottom
of the header.
- Ensure the scanning state takes the active detail panel into
account.

Bug:16145178
Change-Id: I7f80c458ff6565aa00085da9059a4e9fe7e49233
 2014-08-16 10:54:24 -04:00
Nicolas Prevot
f52233df74 Merge "When forwarding intents, ignoring the package set in the intent." into lmp-dev 2014-08-16 04:29:45 +00:00
Terry Heo
03861d0721 Merge "CEC: Handle Remote Control command" into lmp-dev 2014-08-16 04:12:14 +00:00
Terry Heo
3e1564ee39 CEC: Handle Remote Control command 
Generate an Android key event when a UserControl message is received.
And report menu state active when a MenuRequest message is received to
notify sender can send a UserControl message.

Bug: 16938007
Change-Id: Id8f393dc254508b9e7a6fa203f8e817fbe807e38
 2014-08-18 16:09:10 +09:00
John Reck
9eee9dca63 Merge "Don't mangle layer paint's alpha" into lmp-dev 2014-08-16 04:01:11 +00:00
John Reck
fb5899d6e0 Don't mangle layer paint's alpha 
Bug: 15918037

Change-Id: Iecca0908c6e3b77f15807f75a8294d34975533b4
 2014-08-18 08:53:36 -07:00
Adrian Roos
d47ad033c3 Fix bars jumping to black on activity launch 
During animations, the wallpaper crop is the
union of the start and end crop. This prevents
the system bars from jumping to black when an
activity with opaque bars is launched.

Bug: 16441036
Change-Id: Ic0f3bc2e83b9830514a3456a27ae6f23716f3240
 2014-08-18 14:37:18 +00:00
Jason Monk
95d9ad0f79 Merge "Fixes to lock task API from API review" into lmp-dev 2014-08-16 04:32:18 +00:00
Adam Lesinski
7911c512cf Merge "AAPT: Output only 64-bit arch when multiArch is true" into lmp-dev 2014-08-16 04:01:11 +00:00
Adam Lesinski
e47fd12905 AAPT: Output only 64-bit arch when multiArch is true 
When android:multiArch="true" in the <application> tag,
aapt dump badging should only output the 64-bit architecture
under the 'native-code' entry.

Other architectures will be emitted under the 'alt-native-code'
entry.

Bug:17061929
Change-Id: I8310b2388b06a2ed571e5e121e4989403082ba68
 2014-08-15 22:25:36 -07:00
Jae Seo
c22d0c0941 TIF: Make passthrough related method names consistent 
Bug: 17063792
Change-Id: Id76b37ae1507db5d78319b8786b395353ded70e1
 2014-08-16 04:52:56 +00:00
Baligh Uddin
1df29f0889 am 7969be0b: (-s ours) am 5c7015d7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '7969be0bb858c2fdc69b72f7c8f90f1dcdba3395':
  Import translations. DO NOT MERGE
 2014-08-16 04:02:30 +00:00
Baligh Uddin
144c0fe9b8 am fc5f24d8: (-s ours) am db511f23: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'fc5f24d874e36d9e2bb73b21e6ed7fcac0e1d80c':
  Import translations. DO NOT MERGE
 2014-08-16 04:02:26 +00:00
Baligh Uddin
f3f909d48b am bd42c307: (-s ours) am e2541778: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'bd42c307c4c0138d36dbe22c2e1ca7e92e71b117':
  Import translations. DO NOT MERGE
 2014-08-16 04:02:22 +00:00
Baligh Uddin
054b5bbb2b am 00392713: (-s ours) am a519df6a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '0039271391089eeecb990ad0e66ba6e19f24eceb':
  Import translations. DO NOT MERGE
 2014-08-16 04:02:18 +00:00
Baligh Uddin
eae61b82bd am 5b634929: (-s ours) am 3f374ac1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '5b634929763b1b481ad642770756bc67ac89080f':
  Import translations. DO NOT MERGE
 2014-08-16 04:02:13 +00:00
Chulwoo Lee
3d34b54ca8 Merge "Fix ConcurrentModificationException in PersistentDataStore" into lmp-dev 2014-08-16 04:01:11 +00:00
Jungshik Jang
4612a6e111 Implement MHL send key action. 
This class introduces two classes, MhlSendKeyAction and
HdmiMhlKeycode.
 - MhlSendKeyAction is a feature action that manages MHL message
for RCP, Remote Control Pass Through.
 - HdmiMhlKeycode is a collection of MHL keycode including keycode
mapping between MHL and Android keycode.

Bug: 16966459
Change-Id: Ib3f7229c71b66837cd0d239e5af1940dfccee7df
 2014-08-18 11:16:47 +09:00
Chulwoo Lee
404bef8a1d Fix ConcurrentModificationException in PersistentDataStore 
BUG: 17092853
Change-Id: I613c90b5b78ce317996edb2fda1703aaa318fb1e
 2014-08-17 23:44:49 +00:00
Jinsuk Kim
98f4c16a7b Merge "CEC: Replace the usage of logical address with id for HdmiDeviceInfo" into lmp-dev 2014-08-16 04:12:14 +00:00
Baligh Uddin
2abea6c457 am 129ad0e1: (-s ours) am ad6b1426: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '129ad0e15bafe65f3060b7bd4ea9eb973ece767b':
  Import translations. DO NOT MERGE
 2014-08-16 04:00:45 +00:00
Baligh Uddin
0be2a43284 am 062feaf3: (-s ours) am 2f53238f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '062feaf39594df4b09fc6e1b005bb72b334f3c79':
  Import translations. DO NOT MERGE
 2014-08-16 04:00:42 +00:00
Baligh Uddin
ec24beafec am b2df3e40: (-s ours) am 97ffe946: (-s ours) Import translations. DO NOT MERGE 
* commit 'b2df3e40d5bb08295ebb9ee72bd601d88545cc2c':
  Import translations. DO NOT MERGE
 2014-08-16 04:00:38 +00:00
Michael Wright
5e8abf8ede Merge "Remove MediaProjection#createAudioRecord API" into lmp-dev 2014-08-16 03:56:00 +00:00
Michael Wright
d5bfcff975 Remove MediaProjection#createAudioRecord API 
Change-Id: I60def1944a1669b9c1da4cd9aa28af36ad852e94
 2014-08-17 17:59:22 -07:00
Robert Greenwalt
804322564b Merge "Fix a logic error so mtu works." into lmp-dev 2014-08-16 03:52:42 +00:00
Baligh Uddin
c27c397ec3 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-16 04:01:11 +00:00
Baligh Uddin
eeb82d8289 Import translations. DO NOT MERGE 
Change-Id: I331a48ef418aa24e80bf690a566dd970e7a2b398
Auto-generated-cl: translation import
 2014-08-15 22:25:13 -07:00
Michael Wright
8e5482f6ed Merge "Change 'disable hardware keyboard' to 'show input method'" into lmp-dev 2014-08-16 03:52:42 +00:00
Michael Wright
665366a305 Change 'disable hardware keyboard' to 'show input method' 
Previously it implied that the hardware keyboard would be disabled,
but really the toggle would just enable showing the IME even if a
hardware keyboard was present. Changed the string and swapped the
semantics to be more clear about the behavior.

Bug: 14066881
Change-Id: I9c8a7eb98b5277f1d09cc19fa7402e9b4cf51d92
 2014-08-17 17:51:19 -07:00