148026 Commits

Author SHA1 Message Date
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
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
Alan Viverette
d59c585588 Merge "Update fast scroller preview for Material" into lmp-dev 2014-08-18 21:31:41 +00:00
Adam Lesinski
27a217453f Merge "Revert "Include build number in aapt version"" into lmp-dev 2014-08-18 21:00:53 +00:00
Adam Lesinski
9a9a17eb07 Revert "Include build number in aapt version"
This reverts commit a7ce555ee82ed91345a54ee171dc9a415b65e134.

Change-Id: I1018747766963e75bec11ddb01ba6d138f133959
2014-08-18 22:39:38 +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
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
Baligh Uddin
e8c130f838 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-16 03:52:42 +00:00
Baligh Uddin
ab5c77cfcc Import translations. DO NOT MERGE
Change-Id: Idc57a1961ba0cf31e9542f6bf2666cebc7e82c68
Auto-generated-cl: translation import
2014-08-15 22:23:37 -07:00
Dianne Hackborn
90f58b4447 Merge "Make sure we initialize to enable the default voice interaction service." into lmp-dev 2014-08-16 04:29:45 +00:00
Dianne Hackborn
3c50bf00a6 Merge "Fix issue #14617210: Apps can gain access to any ContentProvider..." into lmp-dev 2014-08-16 03:51:48 +00:00
Dianne Hackborn
028ceeb472 Fix issue #14617210: Apps can gain access to any ContentProvider...
...with grantUriPermissions (no user interaction required)

Add a new path in to the activity manager to start an activity as
if it was directy started by the original calling activity.  This
is specifically for the resolver activity and chooser activity to
be able to safely launch its data after serving as an intermediary.

Access to the new method is highly restricted -- it can only be
called by an activity that is declared in the framework apk itself,
and the execute-as-the-caller behavior will only happen if the
code is running under the system uid.  (This means we could still
have these run in the client's process in some cases and still work
correctly.)

Note there is some commented out code here half-done about trying
to propagate security exceptions back to the original calling
activity.  This would be really nice, especially now with the
chooser activity running in a system process so any errors made
by the app (bad permission grants, bad intents, etc) no longer
actually appear in the app so are essentially invisible.  I'd
really like to figure out a way to propagate these exceptions back
to the app, but this is hard since the app's process may no
longer even be running at this point.

Also tweak activity manager dump output to split the recents
dump out from activities, since recents can now be super large.

Change-Id: I50410c4783faf9302c69290589a068a846e0973a
2014-08-18 11:35:12 -07:00
Nicolas Prévot
2e365c805a Merge "Revert "Adding the requiredForProfile flag."" into lmp-dev 2014-08-16 04:29:45 +00:00
Nicolas Prévot
6d24849387 Revert "Adding the requiredForProfile flag."
This reverts commit 531270a4a177a9f245d328d9467c6d1adbd5354a.

BUG: 17102702

Change-Id: Iec5d047dc74bd4899662ede82c48fc024238427c
2014-08-18 12:51:11 +01:00
Craig Stout
26bcdf14cf Merge "Fix alert, date picker, time picker dialogs for TV." into lmp-dev 2014-08-16 04:03:42 +00:00
Ricardo Cervera
bb8f4a6113 am f960409f: am 72ca94ee: am d0842384: docs: Updated links for Android Studio 0.8.6
* commit 'f960409f3b361df492ea7a9a48aefe89d5992572':
  docs: Updated links for Android Studio 0.8.6
2014-08-18 18:06:43 +00:00
Lenka Trochtova
8450fd17b1 Merge branch 'lmp-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev 2014-08-18 18:06:41 +00:00
Deepanshu Gupta
5cb5059b6c am da9baa15: am d519f742: am b6c923a2: am 59eedf52: Layoutlib: Update wifi and battery icon for KK
* commit 'da9baa15bf780d4e8924adbed3d8863c75da5e6c':
  Layoutlib: Update wifi and battery icon for KK
2014-08-18 18:06:26 +00:00
Deepanshu Gupta
6e8a98c8b7 am a4ceb9e6: am 32faabbe: Layoutlib: Update wifi and battery icon for KK
* commit 'a4ceb9e64cd1ee6302e41c7799ebb6610af96d0e':
  Layoutlib: Update wifi and battery icon for KK
2014-08-18 18:06:07 +00: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
Sailesh Nepal
7257bd8b51 Merge "Make AudioState constructors public" into lmp-dev 2014-08-16 04:01:11 +00:00
Sailesh Nepal
1d04c0f394 Make AudioState constructors public
This is needed for unit tests.

Bug: 17073934
Change-Id: I04659faa54ba03247519237450b0a26f66958e8c
2014-08-17 18:39:13 -07:00
Craig Stout
fd4bc4cdca Fix alert, date picker, time picker dialogs for TV.
b/15194230

Change-Id: I85bcef86332acb041e5c3b1f8c515d981486c3d1
2014-08-15 20:56:14 -07:00
Svetoslav
d109f03e3a Merge "Fix a crash in RemoteViews." into lmp-dev 2014-08-16 03:56:00 +00:00
Svetoslav
14494a8760 Fix a crash in RemoteViews.
We are now using the application info of the target app
of the remote views to create a deicated context for
loading resources. The code that is looking up the app
info was using the appilcation context of the current
app which may be null. Now we are using the base context
which is never null.

bug:17005860

Change-Id: Ibcf8b6f81fe24d23a82327870741146c8864ce8f
2014-08-18 10:54:12 -07: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
Sunny Goyal
0efc1186fe Merge "Fixing bounds check." into lmp-dev 2014-08-16 03:56:00 +00:00
Sunny Goyal
681bf60ce2 Fixing bounds check.
Change-Id: Ie17b173ef88288076a5cbfdc741b8e105dcda03e
2014-08-18 11:14:42 -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
Dianne Hackborn
14b763a04e Merge "Fix path for handling system window with app token." into lmp-dev 2014-08-16 03:51:48 +00:00
Dianne Hackborn
15ed2754a3 Fix path for handling system window with app token.
It is wrong to turn the token into a null appWindowToken; we
need to create a new top-level token as if they had passed in null.

Change-Id: I870d8167c6ed456ea8fd58b149809ec9e0103bce
2014-08-18 15:48:41 -07:00
Alan Viverette
04019ee91b Merge "Throw exception when inset drawable is missing drawable attribute" into lmp-dev 2014-08-18 21:31:41 +00:00