Commit Graph

43004 Commits

Author SHA1 Message Date
Dianne Hackborn
00eea5072b am 4a0bc3cc: am 2dff9254: Merge "Fix issue #14617210: Apps can gain access to any ContentProvider..." into lmp-dev
* commit '4a0bc3cc94f034f0a83f1e68edf7d440181777ba':
  Fix issue #14617210: Apps can gain access to any ContentProvider...
2014-08-18 19:29:08 +00:00
Nicolas Prévot
cf4d240140 am 9ecc411b: am 1e8e553b: Merge "Revert "Adding the requiredForProfile flag."" into lmp-dev
* commit '9ecc411b74923957691a9150acb9c3b38d27cd41':
  Revert "Adding the requiredForProfile flag."
2014-08-18 19:29:03 +00:00
Svetoslav
7a3867f3e5 am f0307cc9: am 1b3e768a: Merge "Fix a crash in RemoteViews." into lmp-dev
* commit 'f0307cc91363b8e2b37372b72a5a44c3ce9aa9ab':
  Fix a crash in RemoteViews.
2014-08-18 19:28:58 +00:00
Sunny Goyal
7bf7a25618 am 868b656d: am 860af1e5: Merge "Fixing bounds check." into lmp-dev
* commit '868b656d19dc6920fbcabe61e4913f95c4b68de0':
  Fixing bounds check.
2014-08-18 19:28:53 +00:00
Craig Stout
c27e79d3e1 am b23f941f: am a245102a: Merge "Fix alert, date picker, time picker dialogs for TV." into lmp-dev
* commit 'b23f941f0f0b2ad267b8617aefd41bdc132fd21a':
  Fix alert, date picker, time picker dialogs for TV.
2014-08-18 19:28:48 +00:00
Kenny Root
74a74b637e am b4b398b7: am 286a1434: Merge "Revert "Remove the warning if the caller gets the insecure variant and add hostname verification (SNI)"" into lmp-dev
* commit 'b4b398b7cae59c581930acc58d9b9f09262c0695':
  Revert "Remove the warning if the caller gets the insecure variant and add hostname verification (SNI)"
2014-08-18 19:28:14 +00:00
Dianne Hackborn
80086cd4b4 am a0a64624: am 728f5d08: Merge "Work on issue #16629489: Google (Play?) Services eating through battery" into lmp-dev
* commit 'a0a646245c6aefa9d8303b641256381e639f0d47':
  Work on issue #16629489: Google (Play?) Services eating through battery
2014-08-18 19:17:51 +00:00
Dianne Hackborn
84ba83bb3d am af6eb301: am e882cea6: Merge "Fix issue #17082301: replacePreferredActivity is ignoring userId" into lmp-dev
* commit 'af6eb301c54d90e534ed058c88f6ca7e907eb340':
  Fix issue #17082301: replacePreferredActivity is ignoring userId
2014-08-18 19:17:47 +00:00
Adrian Roos
48986869c3 am 2ff048ff: am a31e2348: Play "device trusted" sound when onTrustInitiatedByUser fires
* commit '2ff048ff5587e029e83e17fdfdecaa3fa0fd70c2':
  Play "device trusted" sound when onTrustInitiatedByUser fires
2014-08-18 17:14:52 +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
John Reck
30bb86629a am 98270e20: am 976189a1: Merge "Don\'t mangle layer paint\'s alpha" into lmp-dev
* commit '98270e20063bd6446c088335c957bb5062ba5cf1':
  Don't mangle layer paint's alpha
2014-08-18 16:21:34 +00:00
Jason Monk
d6ea61cd15 am 75391416: am 71793e71: Merge "Fixes to lock task API from API review" into lmp-dev
* commit '75391416fe284946f41cfa39799f7e580975fbbf':
  Fixes to lock task API from API review
2014-08-18 13:51:09 +00:00
Jinsuk Kim
b347ed75cd am c68c9dbd: am 47a91229: Merge "CEC: Replace the usage of logical address with id for HdmiDeviceInfo" into lmp-dev
* commit 'c68c9dbdd5b1e70a429ff2283348a5609522d8cb':
  CEC: Replace the usage of logical address with id for HdmiDeviceInfo
2014-08-18 02:37:42 +00:00
Michael Wright
9c64c18b10 am 1a63d067: am ab1b372c: Merge "Change \'disable hardware keyboard\' to \'show input method\'" into lmp-dev
* commit '1a63d067582aa909b48832faefac7f97ab4825f1':
  Change 'disable hardware keyboard' to 'show input method'
2014-08-18 02:10:24 +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
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 531270a4a1.

BUG: 17102702

Change-Id: Iec5d047dc74bd4899662ede82c48fc024238427c
2014-08-18 12:51:11 +01: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
Craig Stout
26bcdf14cf Merge "Fix alert, date picker, time picker dialogs for TV." into lmp-dev 2014-08-16 04:03:42 +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
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
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
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
Robert Greenwalt
bbca13351a am 316c9421: am c993be52: Add tcp buffer size conduit to NetworkAgent.
* commit '316c9421eda732bd510631acd9384b593f37f027':
  Add tcp buffer size conduit to NetworkAgent.
2014-08-17 23:22:32 +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
Dianne Hackborn
28bb0b8ff3 am 7da20cdf: am 83249fc9: Merge "Make sure we initialize to enable the default voice interaction service." into lmp-dev
* commit '7da20cdf3c36162ab02790dc99a8c7592e86a015':
  Make sure we initialize to enable the default voice interaction service.
2014-08-16 19:09:39 +00: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
Santos Cordon
4adf4b0882 am ef80aab4: am 5a496deb: Merge "Fixing wrong tag usage" into lmp-dev
* commit 'ef80aab4cd9042171bdd14f2afb89de72d96db06':
  Fixing wrong tag usage
2014-08-16 03:56:27 +00: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
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
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
Alan Viverette
7544bb43f0 am 95495581: am 4c200997: Merge "Fix date and time picker styling" into lmp-dev
* commit '954955811273138b9262f8a1e2ae6df78bdf77e0':
  Fix date and time picker styling
2014-08-16 03:14:24 +00:00
Jeff Brown
ae330728bf am dbab7079: am 23c7b927: Add trace tag for power management.
* commit 'dbab7079dc0cde1026c39149f8240260ce09df8a':
  Add trace tag for power management.
2014-08-16 03:14:14 +00:00
Alan Viverette
e40b205ef4 am 3adb9051: am 47eba14f: Merge "Better handling of unresolved theme attributes" into lmp-dev
* commit '3adb9051a29c904f3a09d82b74c41d16cfa84ca3':
  Better handling of unresolved theme attributes
2014-08-16 03:13:06 +00:00
Alan Viverette
5502a547eb am 1125e88d: am 04ce8195: Merge "Scrapping the view at position zero is still position zero" into lmp-dev
* commit '1125e88d3955f900242754691238995b45d00027':
  Scrapping the view at position zero is still position zero
2014-08-16 03:12:58 +00:00
Dianne Hackborn
16ec0808b5 Make sure we initialize to enable the default voice interaction service.
We weren't taking care of the case of an upgrade to L.  The main
change here is that the voice interaction service setting now has
an empty string when the user has explicitly said they don't want
one, so when it is null we will initialize it to its default.

Change-Id: Icdd30b4f09498f8928cea759a64628bd43bc5d0e
2014-08-15 18:34:10 -07:00
Jeff Brown
3edf5272fb Add trace tag for power management.
Instrumented the basic power manager state transitions,
calling into the Power HAL, setting the display power mode,
and setting the backlight.

Bug: 17004602
Change-Id: I4e362162ddfd7292a7eea8b5d029ce3f6593c4a9
2014-08-16 01:21:41 +00:00
Ruben Brunk
384681f18b am 8d392ff3: am f1aea7f9: Merge "camera2: Add jpeg metadata for LEGACY shim." into lmp-dev
* commit '8d392ff3b6430b144c7b3d94aed5f0c0154c7440':
  camera2: Add jpeg metadata for LEGACY shim.
2014-08-16 00:22:01 +00:00
Ruben Brunk
ffd87c21ab am 8b90513e: am b62eea57: camera2: Fix shim aspect ratio scaling.
* commit '8b90513e20c7e99731e5e8c05b8705ba8c18b3b4':
  camera2: Fix shim aspect ratio scaling.
2014-08-16 00:21:56 +00:00
Ruben Brunk
a9bc355910 camera2: Fix shim aspect ratio scaling.
Bug: 16494207
Change-Id: I4bd40dee1caaf8c83a0853d48d44cc97151f9b41
2014-08-15 23:51:52 +00:00
Adam Lesinski
ec620de00c am 345efd9a: am 58157586: Merge "Add FeatureGroup to PackageInfo" into lmp-dev
* commit '345efd9a6988601e67d3c0202e433144670b5e62':
  Add FeatureGroup to PackageInfo
2014-08-15 23:16:50 +00:00
Jeff Sharkey
690881325f am 61c28588: am a1af0d42: Merge "PackageInstaller API refactoring." into lmp-dev
* commit '61c28588f4b8d748c95791446e1ca0ca6f7df060':
  PackageInstaller API refactoring.
2014-08-15 23:16:45 +00:00