14545 Commits

Author SHA1 Message Date
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
Ruben Brunk
91019c9ef3 Merge "Remove dependency on JNIHelp header side effects." into klp-dev 2013-09-12 00:01:28 +00: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
Alex Ray
5022f275e3 consumer_ir: add length to get carrier freqs
Change-Id: I2c1ac27e46c0bcfdfadef227a2fa79bdcf7085d4
2013-09-11 16:21:25 -07: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
Ruben Brunk
87eac99a21 Remove dependency on JNIHelp header side effects.
Bug: 10680559
Change-Id: I47870d6c48906e0a420c52b7bc5945ffe29c68a2
2013-09-10 20:47:43 -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
Craig Mautner
3f339d8193 am 88cfdae6: am cdd82540: Merge "When waiting for activity to finish don\'t reset" into klp-dev
* commit '88cfdae667bd85931c1bf81781a54472a8fe3ac7':
  When waiting for activity to finish don't reset
2013-09-10 15:17:23 -07:00
Craig Mautner
cdd82540f2 Merge "When waiting for activity to finish don't reset" into klp-dev 2013-09-10 22:11:58 +00:00
Yuhao Zheng
b1bf5f6132 am 41c55361: am e91a3f52: Merge "Add a hidden API to toggle airplane mode." into klp-dev
* commit '41c55361d1a68d5d41cc2ff5b1b486b0ed0109fc':
  Add a hidden API to toggle airplane mode.
2013-09-10 10:16:50 -07:00
Yuhao Zheng
5cd1a0e8d7 Add a hidden API to toggle airplane mode.
Added a hidden API under ConnectivityManager to toggle airplane mode.
This may be a temp solution for b/10653570.
bug:10653570

Change-Id: I0b2b42230073289eb8dc6891317d62b84e26c133
2013-09-10 09:57:12 -07:00
Craig Mautner
5c494547af When waiting for activity to finish don't reset
In cases where the client is waiting for an activity to launch
(startActivityMayWait()) it is a bad idea to clear
ActivityRecord.displayStartTime when going into the pause state. If
displayStartTime is cleared before the activity is displayed,
the client will never be released.

This fix keeps pause from clearing displayStartTime if any client
is waiting for the activity to be displayed.

Fixes bug 10095558. But not a permanent fix, startActivityMayWait()
should not be called by any production code.

Change-Id: I7cbdcb04256f4a26233867c52aedd3bc4151adc3
2013-09-10 07:39:51 -07:00
Igor Murashkin
a86ab640f7 Surface: Change OutOfResourcesException to be a runtime exception
- Deprecates SurfaceTexture.OutOfResourcesException, it wasn't used
- Make all JNI code throw only Surface.OutOfResourcesException
- Get rid of redundant SurfaceControl.OutOfResourcesException

Bug: 10566539
Change-Id: I58126260771b9ccff6a69c672ce7719b9f98138d
2013-09-09 21:53:59 -07:00
Vinit Deshapnde
10652a95b1 Fix invalid Wifi Network system crash
There is some validation code that is eventually detecting that we
have an invalid network; only the result is a crash. The right thing
to do is to do validation up front; and fail calls if the network
configuration looks invalid.

Bug: 10571289

Change-Id: I100506b777a34b26ac9a310ba508140560f87a90
2013-09-09 16:24:36 -07:00
Craig Mautner
72a533adac am e2b8bd72: am 16c32207: Merge "Do not enter resumeTopActivity recursively." into klp-dev
* commit 'e2b8bd72bd325de9c258fa9c8ef4143420796614':
  Do not enter resumeTopActivity recursively.
2013-09-09 15:02:44 -07:00
Craig Mautner
16c3220734 Merge "Do not enter resumeTopActivity recursively." into klp-dev 2013-09-09 21:55:20 +00:00
Svetoslav Ganov
b47a65eeec am 5e811115: am cf305e18: Merge "Add dumping the state of the print sub-system." into klp-dev
* commit '5e811115a9e106a9a167354ba6700146015ecb97':
  Add dumping the state of the print sub-system.
2013-09-09 14:14:39 -07:00
Dianne Hackborn
9542acab2f am d8c06fab: am 80213add: Merge "Fix issue #10671878: Proc stats needs to remove old data structures" into klp-dev
* commit 'd8c06fab80d4fa6c2eeef697bdfdbaff88b3d934':
  Fix issue #10671878: Proc stats needs to remove old data structures
2013-09-09 14:14:36 -07:00
Svetoslav Ganov
cf305e18c3 Merge "Add dumping the state of the print sub-system." into klp-dev 2013-09-09 20:41:28 +00:00
Dianne Hackborn
80213addda Merge "Fix issue #10671878: Proc stats needs to remove old data structures" into klp-dev 2013-09-09 20:37:02 +00:00
Svetoslav Ganov
b669917825 Add dumping the state of the print sub-system.
Being able to dump the state of the print sub-system especially when
taking a bugreport is very useful for bug fixing and observing whether
the print system operates properly.

bug:10659019

Change-Id: Id098b788f474ab17766966a4563ffdfc0171c76b
2013-09-09 13:15:15 -07:00
Craig Mautner
e5273b422e Do not enter resumeTopActivity recursively.
Changes for translucent activity were causing activities to be
launched twice due to a recursive call into resumeTopActivity.
Putting the translucent action onto a handler removes the recursivity
and fixes the multiple launch problem.

Fixes bug 10556969.

Change-Id: I2bb53cd555b0aaf093ab35db2859acb10b58211e
2013-09-09 12:57:47 -07:00
Eric Rowe
001ebe0ec6 am a130a316: am e13aa0ba: Merge "Add PID to ANR logcat printout." into klp-dev
* commit 'a130a3161432bd4e2f267d3de43c75c9a87c667a':
  Add PID to ANR logcat printout.
2013-09-09 11:36:30 -07:00
Eric Rowe
4e94f93a7d Add PID to ANR logcat printout.
Bug: 10568033
Change-Id: I7131520c887df1f897b7a135b04509bdad9bdb88
2013-09-09 10:34:12 -07:00