12646 Commits

Author SHA1 Message Date
Geremy Condra
78a4c718e3 Add the TZInfo updater and relevant intent.
Also add a hook for ConfigUpdateInstallReciever subclasses to
change the delivery of data- in this case, from raw text to
b64 encoded binary.

Change-Id: I4859c8db1cc97c2427310a108b2fef03975df2b4
2013-01-30 17:11:44 -08:00
Wink Saville
32ee0fb2e3 am 75d880df: Merge "Revert "Clean up published network condition reporting.""
# Via Android (Google) Code Review
* commit '75d880dfb0bb1342bce0b0337c7ae752d75ff1b6':
  Revert "Clean up published network condition reporting."
2013-01-30 16:35:21 -08:00
Wink Saville
75d880dfb0 Merge "Revert "Clean up published network condition reporting."" 2013-01-31 00:32:36 +00:00
Todd Poynor
b10c0f97e9 am afae9d24: Merge "BatteryService: Treat USB charging ports and charging accessories as AC"
# Via Android (Google) Code Review (1) and Todd Poynor (1)
* commit 'afae9d248ade0cb0b719f680804acfb9d20ca36b':
  BatteryService: Treat USB charging ports and charging accessories as AC
2013-01-30 16:30:44 -08:00
Todd Poynor
79e1df27b3 am b86d026a: Merge "BatteryService: Allow power supplies to switch type between AC and USB"
# Via Android (Google) Code Review (1) and Todd Poynor (1)
* commit 'b86d026a7f4108caefa080cf9e0c0b4b5e275a84':
  BatteryService: Allow power supplies to switch type between AC and USB
2013-01-30 16:30:41 -08:00
Wink Saville
5b7573e835 Revert "Clean up published network condition reporting."
In some cases causes grey ICON's.

This reverts commit 82413d0b2acad73b9a008e0c53392a54f9555cf8

Change-Id: I09f893d03651c3fb9fcb88ee9e5ac7ce6cb6e273
2013-01-31 00:30:13 +00:00
Todd Poynor
afae9d248a Merge "BatteryService: Treat USB charging ports and charging accessories as AC" 2013-01-30 23:20:18 +00:00
Todd Poynor
b86d026a7f Merge "BatteryService: Allow power supplies to switch type between AC and USB" 2013-01-30 23:19:40 +00:00
Todd Poynor
78d8fe4bd6 BatteryService: Treat USB charging ports and charging accessories as AC
Change-Id: If98330b09a1fc44992bb96195804d434a4e20470
2013-01-30 14:24:12 -08:00
Geremy Condra
ad462d2d16 Fix ConfigUpdater for binary files.
Change-Id: I7643024d5d59dcb6c867ad80d32e24e8da83ba0d
2013-01-30 11:26:49 -08:00
Todd Poynor
701bfb1034 BatteryService: Allow power supplies to switch type between AC and USB
Accomodate power_supply drivers that switch between MAINS and USB type
according to the current power source.  Re-read the type attribute when the
power supply is online.

Switch to String8 type for strings stored locally.

Change-Id: Iacce49bf3ad85f35a7295a54df43aff7f94f3100
2013-01-30 11:24:56 -08:00
Satoshi Kataoka
fc14e1c7a2 am da01da17: Merge "Do not turn on imes unexpectedly with unit tests"
# Via Android (Google) Code Review (1) and Satoshi Kataoka (1)
* commit 'da01da176d4798d293c90d6280ddc59c780baaa3':
  Do not turn on imes unexpectedly with unit tests
2013-01-29 18:45:36 -08:00
Satoshi Kataoka
da01da176d Merge "Do not turn on imes unexpectedly with unit tests" 2013-01-30 02:41:47 +00:00
Dianne Hackborn
625f4a0be0 am d4d93640: Maybe fix build.
# Via Dianne Hackborn
* commit 'd4d9364019ed071509213b9ce772f4a5904d2847':
  Maybe fix build.
2013-01-29 16:17:17 -08:00
Dianne Hackborn
d4d9364019 Maybe fix build.
Change-Id: Ibad8edb15e7cc332d6c29958a386d32a96f4e755
2013-01-29 16:12:48 -08:00
Dianne Hackborn
9b771678ea am 7f54ffd0: Merge "Improve configuration of default preferred apps."
# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit '7f54ffd0296ce6008b5ea949796e60248a85e2d8':
  Improve configuration of default preferred apps.
2013-01-29 15:56:13 -08:00
Dianne Hackborn
7f54ffd029 Merge "Improve configuration of default preferred apps." 2013-01-29 23:43:20 +00:00
Dianne Hackborn
8a2ed1d7c0 Improve configuration of default preferred apps.
The file that defines default preferred apps is now more
robust.  It is no longer a raw dump of the package
manager settings, but instead a more general list of a
target activity and filter.  When reading it, the remaining
information (match value, set of potential matches) is
determined dynamically.

Change-Id: I0edc6e0d2ed3dd2a6e2238992f18f7fc1f51d8d4
2013-01-29 15:18:29 -08:00
Svetoslav
3822896e22 Remove "enhance web scripts" from settings and make it requested by plug-ins.
Currently we have an "enhance web accessibility" setting that has to be
enabled to make sure web content is accessible. We added the setting to
get user consent because we are injecting JavaScript-based screen-reader
pulled from the Google infrastructure. However, many users do not know
that and (as expected) do not read the user documentation, resulting in
critique for lacking accessibility support in WebViews with JavaScript
enabled (Browser, Gmail, etc).

To smoothen the user experience now "enhance web accessibility" is a
feature an accessibility plug-in can request, similarly to explore by
touch. Now a user does not need to know that she has to explicitly
enable the setting and web accessibility will work out-of-the-box.

Before we were showing a dialog when a plug-in tries to put the device
in a touch exploration mode. However, now that we have one more feature
a plug-in can request, showing two dialogs (assume a plug-in wants both
features) will mean that a user should potentially deal with three
dialogs, one for enabling the service, and one for each feature. We
could merge the dialogs but still the user has to poke two dialogs.

It seems that the permission mechanism is a perfect fit for getting
user permission for an app to do something, in this case to enable
an accessibility feature. We need a separate permission for explore
by touch and enhance web accessibility since the former changes the
interaction model and the latter injects JavaScript in web pages. It
is critical to get user consent for the script injection part so we
need a well-documented permission rather a vague umbrella permission
for poking accessibility features. To allow better grouping of the
accessibility permissions this patch adds a permission group as well.

bug:8089372

Change-Id: Ic125514c34f191aea0416a469e4b3481ab3200b9
2013-01-29 13:56:22 -08:00
Svetoslav
bb71b4d159 am 91488eed: Merge changes Ie674e8b2,I0b9448c8
# Via Android (Google) Code Review (1) and Svetoslav (1)
* commit '91488eed1745ea0426a73306f133e02d62580f1a':
  AccessibilityNodeINfo cache not cleared when accessibility is disabled.
  Display magnifier does not release its surface on destroy.
2013-01-28 19:23:24 -08:00
Svetoslav Ganov
984019868a am d0fd5464: Merge "Adding UI test automation APIs."
# Via Android (Google) Code Review (1) and Svetoslav (1)
* commit 'd0fd54648ca6249f56cf469c57181b5a7bbb71d0':
  Adding UI test automation APIs.
2013-01-28 19:23:22 -08:00
Svetoslav
91488eed17 Merge changes Ie674e8b2,I0b9448c8
* changes:
  AccessibilityNodeINfo cache not cleared when accessibility is disabled.
  Display magnifier does not release its surface on destroy.
2013-01-29 03:21:12 +00:00
Svetoslav Ganov
d0fd54648c Merge "Adding UI test automation APIs." 2013-01-29 03:16:40 +00:00
Benoit Goby
cd7a17c645 UsbDebuggingManager: Add interface to clear secure adb keys
This is called from Settings that has a button to clear secure
adb public keys installed on the device.

Change-Id: I63ef499c049766ef13ea6cb0594ed6719f35e5f3
2013-01-28 19:15:30 -08:00
Benoit Goby
e032706da0 am 4daf9b1b: Merge "UsbDeviceManager: Don\'t start UsbDebuggingManager when data is encrypted"
# Via Android (Google) Code Review (1) and Benoit Goby (1)
* commit '4daf9b1ba5d898ac874197543dbd949360edcc45':
  UsbDeviceManager: Don't start UsbDebuggingManager when data is encrypted
2013-01-28 18:36:53 -08:00
Benoit Goby
4daf9b1ba5 Merge "UsbDeviceManager: Don't start UsbDebuggingManager when data is encrypted" 2013-01-29 02:33:44 +00:00
Jeff Brown
8dd68d794c am 5988335a: Merge "Optimize Looper JNI code."
# Via Android (Google) Code Review (1) and Jeff Brown (1)
* commit '5988335aacdbea5b60b597fa2c52583bc655e30f':
  Optimize Looper JNI code.
2013-01-28 18:18:12 -08:00
Jeff Brown
5988335aac Merge "Optimize Looper JNI code." 2013-01-29 02:14:21 +00:00
Jeff Brown
864693461b Optimize Looper JNI code.
Use static native methods.

Release the native looper objects as soon as the Looper quits
instead of waiting until the GC finalizer to take care of it.

Change-Id: I02783e48782a8f972ec2138862f700ade33d8e78
2013-01-28 14:25:53 -08:00
Dianne Hackborn
f77c053c7d am 93f770b5: Merge "Fix bug where we could get stuck repeatedly launching an activity."
# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit '93f770b59fa1bd0f2a5c18fcfaffd2a1fc54f585':
  Fix bug where we could get stuck repeatedly launching an activity.
2013-01-28 12:39:08 -08:00
Dianne Hackborn
93f770b59f Merge "Fix bug where we could get stuck repeatedly launching an activity." 2013-01-28 20:36:59 +00:00
Dianne Hackborn
0798149082 Fix bug where we could get stuck repeatedly launching an activity.
A previous change to avoid losing activities if their process
happens to be gone at the point of launch (by counting that
activity as having its state saved) has resulted in a problem
where an activity that crashes during launch will be repeatedly
relaunched.

This is fixed here by explicitly keeping track of our attempts
to launch the activity since it was last able to save its state,
and not keeping it around if it looks like the launch is
repeatedly failing.

Change-Id: Icefd952443b7eb1222f233db95e0157fc3dd72d1
2013-01-28 11:38:26 -08:00
Victoria Lease
c8d82dd644 am de07d41f: Merge "Annotate Locations coming from mock providers"
# Via Android (Google) Code Review (1) and Victoria Lease (1)
* commit 'de07d41f6396f9f040fed2b6780932d8e5dbb482':
  Annotate Locations coming from mock providers
2013-01-28 09:11:18 -08:00
Victoria Lease
de07d41f63 Merge "Annotate Locations coming from mock providers" 2013-01-28 17:07:39 +00:00
Satoshi Kataoka
f1367b7e90 Do not turn on imes unexpectedly with unit tests
Bug: 7872918

Change-Id: Ie1d74c9fac27de140e7aa85f2eaefcb89aa06ea7
2013-01-28 19:25:55 +09:00
Benoit Goby
78a9687fc2 UsbDeviceManager: Don't start UsbDebuggingManager when data is encrypted
This avoids showing the confirmation dialog from the decryption screen

Bug: 8019508
Change-Id: I7ff364437f6b8aeea26fa8308aa4fe35b7ede5d7
2013-01-25 16:58:13 -08:00
Dianne Hackborn
1a54aa74f7 am b9781fe0: Merge "App ops: you can now turn off operations."
# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit 'b9781fe08c5b1afba086857aa18b46862550ae88':
  App ops: you can now turn off operations.
2013-01-25 11:37:24 -08:00
Dianne Hackborn
b9781fe08c Merge "App ops: you can now turn off operations." 2013-01-25 19:33:11 +00:00
Dianne Hackborn
5e45ee6752 App ops: you can now turn off operations.
Also add new ops for calendar and wi-fi scans, finish
implementing rejection of content provider calls, fix
issues with rejecting location calls, fix bug in the
new pm call to retrieve apps with permissions.

Change-Id: I29d9f8600bfbbf6561abf6d491907e2bbf6af417
2013-01-25 11:25:48 -08:00
Laurent Tu
eb3d4a3b42 am 377fc095: Merge "Fix GpsLocationProvider.enable/disable/isEnabled"
# Via Android (Google) Code Review (1) and Laurent Tu (1)
* commit '377fc095e142b160b5093ed1d3717d0b18aff0f9':
  Fix GpsLocationProvider.enable/disable/isEnabled
2013-01-24 15:44:47 -08:00
Laurent Tu
377fc095e1 Merge "Fix GpsLocationProvider.enable/disable/isEnabled" 2013-01-24 23:42:03 +00:00
Laurent Tu
7b5aeca50b Fix GpsLocationProvider.enable/disable/isEnabled
Fix the issue where GpsLocationProvider.isEnabled() returns true when it
is really false (and the other way around), when the handler hasn't
processed the enable/disable messages yet.

This can be systematically reproduced when the caller code is using the
same thread as the thread of the handler in GpsLocationProvider.

For example, this was happening in LocationManagerService.switchUser().
It would start by disabling all the providers (with
updateProviderListenersLocked()), then re-enable them in
updateProvidersLocked() only when isEnalbed()==false, which was in the
wrong state since the GpsLocationProvider.ENABLE message hadn't been
processed yet. As a result, the GpsLocationProvider was disabled upon
startup of the phone.

This is a slight problem for the enable() contract, which specifies that
getStatus() must be handled, getStatus() will be handled but might have
slighty not-up-to-date info in this case.

Bug: 8028017

Change-Id: Iff91a11cc150e9029a6db85b64a10a926e12b0ba
2013-01-24 15:26:02 -08:00
Dianne Hackborn
7af76f20cd am d8ba6cc9: Merge "Add new API to propagate contextual data to the assist action"
# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit 'd8ba6cc9217e2e042106870e9d2e70cfd80426d6':
  Add new API to propagate contextual data to the assist action
2013-01-23 14:51:07 -08:00
Dianne Hackborn
3bfd04ff5a am 51ff575d: Merge "Fix issue #7649720: ANR occur when OTA with lower version..."
# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit '51ff575d1bd0337a68ae173ee699ff8298ddb703':
  Fix issue #7649720: ANR occur when OTA with lower version...
2013-01-23 14:48:41 -08:00
Dianne Hackborn
d8ba6cc921 Merge "Add new API to propagate contextual data to the assist action" 2013-01-23 22:47:57 +00:00
Dianne Hackborn
58b33c3d87 am 846dda3f: Merge "Add new disabled state for "optional" built-in apps."
# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit '846dda3fa7a194b57acdb977e443c93c7cddcea1':
  Add new disabled state for "optional" built-in apps.
2013-01-23 14:47:17 -08:00
Dianne Hackborn
51ff575d1b Merge "Fix issue #7649720: ANR occur when OTA with lower version..." 2013-01-23 22:46:01 +00:00
Dianne Hackborn
846dda3fa7 Merge "Add new disabled state for "optional" built-in apps." 2013-01-23 22:43:11 +00:00
Dianne Hackborn
f9c5e0fe83 Add new API to propagate contextual data to the assist action
When launching an assist, we have a new API allowing the
current foreground activity/application to provide additional
arbitrary contextual information that is stuffed in the
assist intent before it is launched.

Change-Id: I0b2a6f5a266dc42cc0175327fa76774f814af3b4
2013-01-23 14:39:13 -08:00
Dianne Hackborn
c4d27a7d55 Fix issue #7649720: ANR occur when OTA with lower version...
...of Play Store is included

The issue is that the name of the play store apk on the system
image has changed, and the package manager has a bug when this
happens and it is being hidden by an updated version of the
application that is still a newer version.  In this case it
doesn't do the normal scan of the system apk, but just leaves
its old disabled state.  However if the code path has changed,
this will trip up other code that thinks the system apk has
disappeared (since when it checks for the existence of the apk
with the stored code path, it doesn't find anything).

The fix here is to add a special case to make sure the code
path is updated even if we are otherwise ignoring the hidden
system image package data.

Change-Id: Ic5118f94c078da7a30b53b9cadf7c9844f7ba866
2013-01-22 18:30:17 -08:00