148072 Commits

Author SHA1 Message Date
Michael Wright
468fef6870 Merge "Persist Show IME option." into lmp-dev 2014-08-18 23:27:42 +00:00
Michael Wright
8b987196ca Merge "Update MenuItem#setShortcut docs" into lmp-dev 2014-08-18 21:31:41 +00:00
Michael Wright
7b69e056fd Update MenuItem#setShortcut docs
Change-Id: I6b73992b0c8d590e8c9884bec377c7c0c1e35720
2014-08-17 17:58:53 -07:00
Michael Wright
7b5a96ba83 Persist Show IME option.
Add a new setting to persist whether to show the IME when a hard
keyboard is connected.

Bug: 14066881
Change-Id: I2237ded850a0d4ab43ca441d0b7df13e0958e630
2014-08-17 17:51:19 -07: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
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
Andrew Solovay
8319455afc Merge "docs: Documented new fields returned by getSkuDetails()." into klp-modular-docs 2014-08-16 04:01:11 +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
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
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
Kenny Root
f6040e9c11 Merge "Revert "Remove the warning if the caller gets the insecure variant and add hostname verification (SNI)"" into lmp-dev 2014-08-16 03:52:42 +00:00
Dianne Hackborn
89e4ae2f50 Merge "Work on issue #16629489: Google (Play?) Services eating through battery" into lmp-dev 2014-08-16 03:56:00 +00:00
Dianne Hackborn
d953c53d3b Work on issue #16629489: Google (Play?) Services eating through battery
There is a bug in how we deal with name overflows combined with resetting
the battery stats data.  If we do a reset while a wakelock is being
actively held that has been put into the overflow bucket, then we can
end up reducing the number of known wake locks in the list so when after
that it is released we try to release it under its real name rather than
the overflow name.

This means we need to keep track of which wake locks have been placed
in the overflow bucket while they are actively being used, so we can be
sure to properly handle it as part of that bucket until it is eventually
released.

This makes things...  somewhat more complicated.  So now we have a class
to take care of all these details, and also use it for other places where
we have the same overflow semantics sync and job stats.

Also fix potential deadlock -- BatteryStatsHelper needs to call on to
ConnectivityManager to find out of there is telepohny, however we use
that class when doing a dump while the battery stats lock is held.  To
fix this, we check the connectivity state up in the battery stats service
before acquiring the lock and propagate that information through to the
dump code.

Change-Id: Ib452206af5c36f4b0f03cc94d2845d36613d1ba5
2014-08-17 12:39:36 -07:00
Dianne Hackborn
57137289a2 Merge "Fix issue #17082301: replacePreferredActivity is ignoring userId" into lmp-dev 2014-08-16 03:56:00 +00:00
Dianne Hackborn
f2ac276127 Fix issue #17082301: replacePreferredActivity is ignoring userId
It was being given the argument and just...  ignoring it.

But the bulk of this change is to make replacePreferredActivity
better about replacing -- it now detects if the request will not
make a change and, in that case, just do nothing.

The reason for this?

It turns out that each time you install an app, the telephony
system is calling this function over 20 times to set the default
SMS app.  This is almost always doing nothing, but before this
change it means we would re-write packages.xml over 20 times...!

There are definitely more improvements that can be made here (delaying
write of packages.xml to allow them to batch together, reducing
the amount of calls being made), but until then this is a big
improvement.

Change-Id: I02c4235b8ecd5c13ef53e65d13c7dc2223719cec
2014-08-16 19:34:13 -07:00
Jake Hamby
f805376956 Merge "Add page info in each segment if carrier does not support EMS." into lmp-dev 2014-08-16 03:52:42 +00:00
Xia Ying
3a9f1aa1e7 Add page info in each segment if carrier does not support EMS.
If EMS is not supported, framework breaks down EMS into single segment
SMS and adds page info " x/y".

In the case of UCS2 encoding type, we need 8 bytes for this, but we
only have 6 bytes from UDH, so truncate the limit for each segment by
2 bytes (1 char).

Change-Id: Ieadb8d27d1cdf2f1e5322ec16c5a62d55e26bdfd
2014-08-18 13:54:16 -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
Chris Craik
9745de0f05 Fix BitmapDrawable outline crash
bug:17103753

Change-Id: Ia3d2c7d61b3f3b9ea8879f941d726d8627e155bb
2014-08-18 11:32:13 -07: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
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
Adam Lesinski
29f0394ac1 Merge "Include build number in aapt version" into lmp-dev 2014-08-16 03:52:42 +00:00
Adam Lesinski
ad75122440 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: I9165c7d01f977344e143c2cb4dd963310ab28b72
2014-08-18 23:42:21 +00:00
destradaa
2d86b70cf3 Merge "Add @SystemApi annotation to Geofence Hardware types." into lmp-dev 2014-08-16 04:03:42 +00:00
destradaa
c4e1e59561 Add @SystemApi annotation to Geofence Hardware types.
b/17008446

Change-Id: Id3f92dd03309324d3343c87da8c3e30733d06a64
2014-08-18 10:22:23 -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
Robert Greenwalt
3f05bf4d78 Add tcp buffer size conduit to NetworkAgent.
bug: 16549611
Change-Id: I7d97dedea2c7c1aed2eccb185645889424508591
2014-08-17 15:14:29 -07:00
Jeff Sharkey
8415477dcc Merge "Progress towards staging ASECs." into lmp-dev 2014-08-16 03:52:42 +00:00
Jeff Sharkey
742e790294 Progress towards staging ASECs.
Move location selection logic into shared PackageHelper location,
and share it between DCS and PackageInstaller.  Fix bugs related to
installed footprint calculation; always count unpacked native libs.

Have PMS do its own threshold checking, since it's fine to stat
devices.  PMS only ever deleted staging ASECs, so move that logic
into installer and nuke unclaimed staging ASECs.  Allocate legacy
ASEC names using PackageInstaller to make sure they don't conflict
with sessions.

Start wiring up session to allocate ASEC and pass through staged
container for installation.

Fix bug to actually delete invalid cluster-style installs.

Bug: 16514385
Change-Id: I325e0c4422fc128398c921ba45fd73ecf05fc2a9
2014-08-18 15:52:24 -07:00