Commit Graph

12268 Commits

Author SHA1 Message Date
Svetoslav
f4f613b127 am a03cf04b: am 25f17f29: Merge "Not change the print options on printer change if possible." into klp-dev
* commit 'a03cf04b8d7bd47dac94208cb1f5df3230a36e86':
  Not change the print options on printer change if possible.
2013-09-12 16:45:37 -07:00
Jeff Brown
67bd48fc3f am 9def46c9: am 09652ac1: Merge "Allow phone to enter suspend with positive proximity." into klp-dev
* commit '9def46c9763c4e32690c15085e04985d29a7d485':
  Allow phone to enter suspend with positive proximity.
2013-09-12 16:45:21 -07:00
David Christie
e82f2c0c2a am 23642e74: am baae82a8: Merge "Don\'t track LocationManager internal requests in AppOps (b/10725757). AppOps stats are used to populate the "apps recently using location" list in settings->location. There is no reason to show Android OS in that list simply because
* commit '23642e74211f3f3f72f929255f36fb7b6384d61e':
  Don't track LocationManager internal requests in AppOps (b/10725757). AppOps stats are used to populate the "apps recently using location" list in settings->location.  There is no reason to show Android OS in that list simply because of internal location requests supporting other clients.
2013-09-12 16:44:46 -07:00
Vinit Deshapnde
8f8c563e6f am b2c06ba5: am b481dae2: Merge "Fix invalid Wifi Network system crash" into klp-dev
* commit 'b2c06ba5711ffa3781b9bfe1c11051cc274be9e3':
  Fix invalid Wifi Network system crash
2013-09-12 16:44:41 -07:00
Svetoslav
6d803dede7 am 410fc394: am ef2088a2: Merge "Handle print serivce crashes." into klp-dev
* commit '410fc39444d479ee708193ac2ae1a81b72187dd3':
  Handle print serivce crashes.
2013-09-12 16:44:37 -07:00
Svetoslav
25f17f295b Merge "Not change the print options on printer change if possible." into klp-dev 2013-09-12 22:38:35 +00:00
Jeff Brown
09652ac1db Merge "Allow phone to enter suspend with positive proximity." into klp-dev 2013-09-12 22:15:38 +00:00
Jeff Brown
ec0832133a Allow phone to enter suspend with positive proximity.
As part of the power manager rewrite in JB MR1, we removed the ability
for the phone to suspend with positive proximity because it was not
clear that the proximity sensor was always correctly registered as
a wake-up source.  The sensor service itself does not contain any
code to manage wake-ups.  Therefore proximity sensor based wake-up
relies on the sensor driver acquiring a timed wake lock when the
sensor reports a negative result.  This behavior is not very well
defined in the sensor HAL so there is a chance that it will not
work reliably on all devices.

This change adds a new config.xml resource to specify whether the
device should be allowed to suspend when the screen is off due to
positive proximity.  Devices that support this feature should set
the "config_suspendWhenScreenOffDueToProximity" resource to "true" in
their resource overlays.  The feature is disabled by default.

Bug: 9760828
Change-Id: Ic65ab7df0357271b133e2e44f5e35e7756e1e9e0
2013-09-12 14:37:21 -07:00
Svetoslav
cc65b0c325 Not change the print options on printer change if possible.
If the user selects some print options from the dialog and then
changes the printer to one that has the same capabilities the
selections in the UI should not change.

bug:10631856

Change-Id: Ia76ce58c446815e3498d2f4b4739dee62d11d96a
2013-09-12 14:29:53 -07:00
David Christie
baae82a853 Merge "Don't track LocationManager internal requests in AppOps (b/10725757). AppOps stats are used to populate the "apps recently using location" list in settings->location. There is no reason to show Android OS in that list simply because of internal location requests supporting other clients." into klp-dev 2013-09-12 20:39:31 +00:00
Vinit Deshapnde
b481dae2f5 Merge "Fix invalid Wifi Network system crash" into klp-dev 2013-09-12 20:28:57 +00:00
Svetoslav
ef2088a26a Merge "Handle print serivce crashes." into klp-dev 2013-09-12 20:24:40 +00:00
David Christie
9e9ce92541 Don't track LocationManager internal requests in AppOps (b/10725757).
AppOps stats are used to populate the "apps recently using location"
list in settings->location.  There is no reason to show Android OS
in that list simply because of internal location requests supporting
other clients.

Change-Id: I6908aa63deb19d22733b8d9cdae6ea5dbbea55e0
2013-09-12 13:19:53 -07:00
Robert Greenwalt
8265343545 am 16666176: am 8f435bac: Merge "Fix Wifi Batch Scanning" into klp-dev
* commit '16666176c0de5abc1f5390b9b2e07c32e51a97f9':
  Fix Wifi Batch Scanning
2013-09-12 11:32:32 -07:00
Robert Greenwalt
8f435baca8 Merge "Fix Wifi Batch Scanning" into klp-dev 2013-09-12 18:22:28 +00:00
Svetoslav
c6066799ad Handle print serivce crashes.
1. Now after a print service crashes we are bringing it to the same
    state of its lifecycle. For example, if a service does a discovery
    and crashes we recreate the discovery session call the start
    discovery method and so on.

2. Turned off debugging logs since we have fully fledged state dump.

bug:10697779

Change-Id: Id790537461428e96b197eef12258996bda2bd1ce
2013-09-12 10:52:26 -07:00
Jeff Brown
e5ac84517d am a0908665: am 737d2c0b: Merge "Ignore ON_AFTER_RELEASE for partial wake locks." into klp-dev
* commit 'a090866557b207efc62197cf7625320babdcaed9':
  Ignore ON_AFTER_RELEASE for partial wake locks.
2013-09-12 09:22:16 -07:00
Jeff Brown
737d2c0b92 Merge "Ignore ON_AFTER_RELEASE for partial wake locks." into klp-dev 2013-09-12 04:03:31 +00:00
Robert Greenwalt
126755cf41 Fix Wifi Batch Scanning
Some parsing bugs, more debug logs, etc.

bug:9301872
Change-Id: I245ab00955e245be81a019750be0f8491aa505fd
2013-09-11 19:31:20 -07:00
destradaa
9d820c5832 am 55a70777: am f8a910fb: Merge "Fix exceptions in the Flp Hal layer: - JNI exception accessing a geofence method with wrong signature - FlpHardwareProvider exception when the monitoring status contains no location information" into klp-dev
* commit '55a707775681e3a51d98f4c8aaf15be074c52ce8':
  Fix exceptions in the Flp Hal layer: - JNI exception accessing a geofence method with wrong signature - FlpHardwareProvider exception when the monitoring status contains no location information
2013-09-11 17:23:49 -07:00
Jeff Sharkey
123eeea6d6 am e2d76fa8: am cecccecc: Merge changes Ib1274847,I2eb2a1bf into klp-dev
* commit 'e2d76fa8c6d0f5c3d1a73a3ec9756c4bc545806d':
  Fix SDK build.
  Request all tethering interfaces, fix corruption.
2013-09-11 17:23:29 -07:00
Tom O'Neill
67ecfe7b48 am 0494832f: am 706113fa: Merge "Improve some javadoc related to isProviderEnabled() apis" into klp-dev
* commit '0494832fc633b72951fd6faeff342ce23d2ecae4':
  Improve some javadoc related to isProviderEnabled() apis
2013-09-11 17:23:09 -07:00
Alexander Ray
4c980cc6ae am b0049151: am 7563d423: Merge "Add consumer IR framework" into klp-dev
* commit 'b0049151f7c1f2ffa7481ac7c6f6baf7a548c5e8':
  Add consumer IR framework
2013-09-11 17:23:01 -07:00
Igor Murashkin
33069f40e5 am 47869404: am 2cad64c0: Merge "Surface: Change OutOfResourcesException to be a runtime exception" into klp-dev
* commit '47869404cb8233c536a0a5d2c5ce4d0089e39882':
  Surface: Change OutOfResourcesException to be a runtime exception
2013-09-11 17:22:40 -07:00
Matthew Williams
7a2ab3a060 Fix deadlock occurring on account add in SyncManager.
deadlock caused by autosync from changing sync settings.
Some minor refactoring of the function that caused the deadlock
Bug: 10666901
Change-Id: I7cf901b1954e59dbb0bc71a5de23117353b460b1
2013-09-11 23:40:17 +00:00
destradaa
f8a910fbd5 Merge "Fix exceptions in the Flp Hal layer: - JNI exception accessing a geofence method with wrong signature - FlpHardwareProvider exception when the monitoring status contains no location information" into klp-dev 2013-09-11 21:15:34 +00:00
Jeff Sharkey
ceccceccff Merge changes Ib1274847,I2eb2a1bf into klp-dev
* changes:
  Fix SDK build.
  Request all tethering interfaces, fix corruption.
2013-09-11 20:16:59 +00:00
destradaa
839904eed8 Fix exceptions in the Flp Hal layer:
- JNI exception accessing a geofence method with wrong signature
- FlpHardwareProvider exception when the monitoring status contains no location information

Bug: 10691492
Change-Id: I1959712912af712dc9dc344f20afd1112da46efc
2013-09-11 12:42:51 -07:00
Tom O'Neill
706113fa2a Merge "Improve some javadoc related to isProviderEnabled() apis" into klp-dev 2013-09-11 19:20:16 +00:00
Alexander Ray
7563d42331 Merge "Add consumer IR framework" into klp-dev 2013-09-11 19:05:38 +00:00
Igor Murashkin
2cad64c0fb Merge "Surface: Change OutOfResourcesException to be a runtime exception" into klp-dev 2013-09-11 18:28:07 +00:00
Tom O'Neill
d5759437ee Improve some javadoc related to isProviderEnabled() apis
- LocationManager.isProviderEnabled() no longer throws SecurityException:
the caller could already circumvent the permission check by calling
Secure.isLocationProviderEnabled()

Change-Id: I5abd04264299671ed35ce4594b5be46d86378767
2013-09-11 11:03:03 -07:00
Yuhao Zheng
c726dcb803 am 05e7e345: am 518c0afa: Merge "Fix for the toggle airplane mode hidden API" into klp-dev
* commit '05e7e3450006438311b18d6b0be920ad5579782a':
  Fix for the toggle airplane mode hidden API
2013-09-11 10:41:55 -07:00
Yuhao Zheng
518c0afaea Merge "Fix for the toggle airplane mode hidden API" into klp-dev 2013-09-11 17:35:09 +00:00
Erik Gilling
51e95df8f2 Add consumer IR framework
Change-Id: I786c00db0cce61ef75e4edc24e90f2cdcba6dbfb
2013-09-11 09:52:47 -07:00
Yuhao Zheng
5530e4b5d4 Fix for the toggle airplane mode hidden API
Fix to https://googleplex-android-review.git.corp.google.com/#/c/356900/
Previous implementation throws SecurityException when the API is called from apps.
bug:10653570

Change-Id: I95ae6f07db74d881f1a8d3d40a6486105a068e90
2013-09-11 09:44:28 -07:00
Adam Skory
a7cda03a47 resolved conflicts for merge of 7d17de35 to master
Conflicts:
	core/res/res/values/public.xml

Change-Id: I14b4e332be7ef27e76a2773a504cb942bd0642ef
2013-09-11 16:16:19 +01:00
Adam Skory
86d9c457de Merge "Revert services assist context in KitKat" into klp-dev 2013-09-11 11:27:50 +00:00
Adam Skory
7140a25f01 Revert services assist context in KitKat
Reverts extension to assist context API to query
foreground services for assist context data.

Also hides Intent.ACTION_VOICE_ASSIST because
nobody's actually using it yet.

Bug: 10461702
Change-Id: Idf6836adc659b434e11ebb2b98e8b814c94a7227
2013-09-11 12:04:58 +01:00
Jeff Sharkey
e4984bea95 Request all tethering interfaces, fix corruption.
netd now tracks statistics for tethered interfaces across tethering
sessions, so switch to asking for all tethering stats.  (Currently
we're double-counting all tethering data, ever since it started
tracking across sessions.)

Also catch OOME to handle corrupt stats files, which we then dump to
DropBox and then start over.

Bug: 5868832, 9796109
Change-Id: I2eb2a1bf01b993dd198597d770fe0e022466c6b9
2013-09-10 21:03:30 -07:00
Jeff Brown
6eade79f90 Ignore ON_AFTER_RELEASE for partial wake locks.
This is a regression in the new power manager.  Apparently
some apps try to use ON_AFTER_RELEASE with partial wake locks
which doesn't make sense.  Ignore the flag just like we used to
prior to JB MR1.

Bug: 10336375
Change-Id: Ib307eb60201612ba9bb03dc4da3365aba0b4848d
2013-09-10 18:45:25 -07:00
Jeff Brown
a6b9a0e1cc am cf667ad7: am 2f1ef77c: Merge "WirelessChargerDetector: Work around bad sensor timestamps." into klp-dev
* commit 'cf667ad7d77559cde0416e2f97a60827acf5e73d':
  WirelessChargerDetector: Work around bad sensor timestamps.
2013-09-10 17:40:36 -07:00
Jeff Brown
2f1ef77c07 Merge "WirelessChargerDetector: Work around bad sensor timestamps." into klp-dev 2013-09-11 00:35:39 +00:00
Jeff Brown
20e2875343 WirelessChargerDetector: Work around bad sensor timestamps.
It turns out that on some devices the sensor event timestamp
may be non-monotonic.  This may cause the detector to hold
a wakelock indefinitely if the time jumps backwards.  These
timestamps are not well tested in general so there may be
other artifacts as well.  Use elapsed realtime instead.

Bug: 9926451
Change-Id: Idb0b316e22b23aac86837bd25b953daf49f9b758
2013-09-10 17:17:08 -07:00
Jeff Sharkey
d375d07538 am fa907baf: am 042bd400: Merge "Include system packages in packages.list." into klp-dev
* commit 'fa907baf5eaaf3efe4259a40b4ea4305881b0450':
  Include system packages in packages.list.
2013-09-10 17:15:34 -07:00
Jeff Sharkey
042bd40054 Merge "Include system packages in packages.list." into klp-dev 2013-09-11 00:07:42 +00:00
Jeff Brown
279f3cdf70 am 9993f8ff: am dc6fd0a2: Merge "Propagate input ANR reason to activity manager log." into klp-dev
* commit '9993f8ff24718553c05872d9f13f4114701b3428':
  Propagate input ANR reason to activity manager log.
2013-09-10 16:58:06 -07:00
Jeff Sharkey
cc8f710a50 Include system packages in packages.list.
This provides group membership to the FUSE daemon, since system
packages like NFC and Bluetooth hold sdcard_rw.

Bug: 10610659
Change-Id: I7428e999cfa4087ffe220b9d8bd80827191ab997
2013-09-10 16:57:24 -07:00
Jeff Brown
dc6fd0a20a Merge "Propagate input ANR reason to activity manager log." into klp-dev 2013-09-10 23:52:53 +00:00
Jeff Brown
bd181bb832 Propagate input ANR reason to activity manager log.
Make it a little easier to diagnose input dispatch timeouts by
providing the detailed reason as the ANR annotation in the log.

Bug: 10689184
Change-Id: Ie18fd9ad066b0673d1f57c030e027ad0085f4650
2013-09-10 16:44:24 -07:00