147971 Commits

Author SHA1 Message Date
Tim Murray
b730d866a0 Fix IO_INPUT with 64-bit.
bug 16846318
bug 17006933

Change-Id: Ic13ef26875d8a6fab1ffb542d62038b768a536ff
2014-08-18 18:14:32 -07:00
Santos Cordon
823fd3c79d Update conference call APIs.
Clean up conference call APIs to use a distinct type separate from
Connection.  Also allow the addition of Conference calls at any point
using addConference() API method.

Bug:16844332
Bug:16449372
Change-Id: I34e45fde1aa43559f5f4e29b990929c188b16875
2014-08-18 17:30:58 +00:00
Guang Zhu
b511c4c1d6 Merge "Disable immersive mode confirmation for test automation" into lmp-dev 2014-08-16 03:56:00 +00:00
Guang Zhu
1dbead1103 Disable immersive mode confirmation for test automation
PolicyControl#disableImmersiveConfirmation to return true as
long as test harness flag is set.

Test harness flag is read via ro.test_harness, and can only be
set to true on builds with root access

Change-Id: I5c2d56e8ea4d5a2972ab42e9a98eb2fce52b11ee
2014-08-17 16:36:44 -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
Adrian Roos
49e057d7ee Play "device trusted" sound when onTrustInitiatedByUser fires
Bug: 16840500
Change-Id: I73fbe5c2cff665ccb637abb9039d57f377d9df53
2014-08-18 16:53:27 +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
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
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
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
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
Robert Greenwalt
3f05bf4d78 Add tcp buffer size conduit to NetworkAgent.
bug: 16549611
Change-Id: I7d97dedea2c7c1aed2eccb185645889424508591
2014-08-17 15:14:29 -07:00
Baligh Uddin
e5df258491 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-16 03:52:42 +00:00
Baligh Uddin
5db16fe79b Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-16 03:52:42 +00:00
Baligh Uddin
d4f7e6cf72 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-16 03:52:42 +00:00
Baligh Uddin
5398915d74 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-16 03:52:42 +00:00
Baligh Uddin
784006f2a1 Import translations. DO NOT MERGE
Change-Id: I29a7b80cea6ddfa59c900472e05d9b72ba53c61f
Auto-generated-cl: translation import
2014-08-15 22:03:24 -07:00
Baligh Uddin
0e900b611c Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-16 03:52:42 +00:00
Baligh Uddin
80631ed867 Import translations. DO NOT MERGE
Change-Id: I287e3613eab6a99a30a025ba979b3eae287478c3
Auto-generated-cl: translation import
2014-08-15 22:05:22 -07:00
Baligh Uddin
812938397e Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-16 03:56:00 +00:00
Baligh Uddin
f14c0f79e1 Import translations. DO NOT MERGE
Change-Id: Iad4e740bda603a5a7fb00961c82f01d34b07d8d4
Auto-generated-cl: translation import
2014-08-15 22:19:11 -07:00