164668 Commits

Author SHA1 Message Date
Leon Scroggins III
650f688c17 am 6bf7bfb5: (-s ours) am 4b2d2add: am 958a7c1c: am 3d3e3bb4: am c7a558fe: am 425d7c87: (-s ours) am 11297581: am 18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE
* commit '6bf7bfb5d2b0693b8b1c4126eea7624e5cfb29f7':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE
2015-05-27 20:20:42 +00:00
Leon Scroggins III
1b4eed5659 am 557ee34d: (-s ours) am 2adefefa: am b6e3f930: am 2bbcc253: am b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev
* commit '557ee34d97c435e19034235aff258aea093efc3f':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE
2015-05-27 20:20:38 +00:00
Leon Scroggins III
6bf7bfb5d2 am 4b2d2add: am 958a7c1c: am 3d3e3bb4: am c7a558fe: am 425d7c87: (-s ours) am 11297581: am 18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE
* commit '4b2d2add3fc1068645790a0bace239b9d868dd30':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE
2015-05-27 17:52:58 +00:00
Leon Scroggins III
557ee34d97 am 2adefefa: am b6e3f930: am 2bbcc253: am b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev
* commit '2adefefa3576142767c45b84d97e05078ead3539':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE
2015-05-27 17:52:51 +00:00
Leon Scroggins III
4b2d2add3f am 958a7c1c: am 3d3e3bb4: am c7a558fe: am 425d7c87: (-s ours) am 11297581: am 18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE
* commit '958a7c1cd816986ac58073ae415b0825c0a11b7b':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE
2015-05-27 17:34:55 +00:00
Leon Scroggins III
2adefefa35 am b6e3f930: am 2bbcc253: am b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev
* commit 'b6e3f930c182ed254e7de3b3e5d22bc7323227f2':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE
2015-05-27 17:34:51 +00:00
Leon Scroggins III
958a7c1cd8 am 3d3e3bb4: am c7a558fe: am 425d7c87: (-s ours) am 11297581: am 18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE
* commit '3d3e3bb445dbd1775cdcab0ac19563400ac2d60a':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE
2015-05-27 17:18:54 +00:00
Leon Scroggins III
b6e3f930c1 am 2bbcc253: am b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev
* commit '2bbcc253254a497b8f9bb86712fb6f0f2548e9f2':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE
2015-05-27 17:18:47 +00:00
Leon Scroggins III
3d3e3bb445 am c7a558fe: am 425d7c87: (-s ours) am 11297581: am 18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE
* commit 'c7a558fe73631e438061c31a54861594f0eb024f':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE
2015-05-27 15:22:45 +00:00
Leon Scroggins III
c7a558fe73 am 425d7c87: (-s ours) am 11297581: am 18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE
* commit '425d7c8713679ce9799139f7f91c6a45caa3b486':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE
2015-05-27 15:10:30 +00:00
Leon Scroggins III
425d7c8713 am 11297581: am 18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE
* commit '11297581667128d2568a47ee03acab5c4f9f2784':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE
2015-05-27 14:53:00 +00:00
Leon Scroggins III
2bbcc25325 am b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev
* commit 'b36ace7401c0e198ceddd2fdb908346b7bb5928f':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE
2015-05-27 14:39:21 +00:00
Leon Scroggins III
1129758166 am 18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE
* commit '18d7926709451b9e767731f46778e4238fc8e3b5':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE
2015-05-27 14:37:18 +00:00
Leon Scroggins III
b36ace7401 Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev 2015-05-27 14:29:31 +00:00
Wale Ogunwale
5714170091 am 0f771240: am bf0439a7: am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
* commit '0f7712407d96a847845b10eef34d9a259c687533':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
2015-05-27 05:52:33 +00:00
Wale Ogunwale
0f7712407d am bf0439a7: am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
* commit 'bf0439a7e8824b4288f52c952a6808c8bdaf3235':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
2015-05-27 05:35:52 +00:00
Wale Ogunwale
bf0439a7e8 am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
* commit '02f3cf79989b202a45753ad74653d48f7d73c73d':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
2015-05-27 05:17:55 +00:00
Wale Ogunwale
02f3cf7998 am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
* commit '523a19bf3df202c58369279fc4e538e9e342c1e7':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
2015-05-27 05:03:29 +00:00
Wale Ogunwale
523a19bf3d am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
* commit 'c9a0c0b90773fded6c251646300231f67c891b78':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
2015-05-27 04:50:11 +00:00
Leon Scroggins III
5cfd16201f Check that the parcel contained the expected amount of region data. DO NOT MERGE
bug:20883006
Change-Id: Ib47a8ec8696dbc37e958b8dbceb43fcbabf6605b
2015-05-26 21:09:24 +00:00
Leon Scroggins III
18d7926709 Check that the parcel contained the expected amount of region data. DO NOT MERGE
bug:20883006
Change-Id: Ib47a8ec8696dbc37e958b8dbceb43fcbabf6605b
2015-05-26 17:05:22 -04:00
Wale Ogunwale
c9a0c0b907 Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
* Applications must now have ...permission.REAL_GET_TASKS to
be able to get process information for all applications.
* Only the process information for the calling application will be
returned if the app doesn't have the permission.
* Privilages apps will temporarily be able to get process information
for all applications if they don't have the new permission, but have
deprecated ...permission.GET_TASKS.

Bug: 20034603
Change-Id: I67ae9491f65d2280adb6a81593693d499714a216
(cherry picked from commit 9dbaa54f6834e013a63f18bd51ace554de811d80)
2015-05-26 17:49:04 +00:00
Griff Hazen
8f585128f5 am d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
* commit 'd4e00d2b9d29e62b1ad989afb1fe2bfe3b519891':
  Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE
2015-05-21 22:58:25 +00:00
Griff Hazen
dc085ed27a am 5825ad23: (-s ours) Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE
* commit '5825ad231319207a64debacaa3db4812548b0442':
  Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE
2015-05-21 22:58:21 +00:00
Griff Hazen
d4e00d2b9d Merge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev 2015-05-21 22:43:48 +00:00
Griff Hazen
5825ad2313 Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE
This CL didn't ship with diamond-release, but will make diamond-mr1.

This reverts commit 80fa3fa027c06be0f4bbd3a4ab319914377d883d.

Change-Id: I1b037b6ac6a504235463a36a5dcd152b6a1434f3
2015-05-21 14:25:50 -07:00
Griff Hazen
6c0b5b3436 Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE
This CL didn't ship with diamond-release, but will make diamond-mr1.

This reverts commit c663d99f007c0faa7b66a569ec4083b82d60ef15.

Change-Id: I1430ed7a3221a4f06ad730778c757a68e16b808b
2015-05-21 14:25:05 -07:00
Filip Gruszczynski
037c9caccd Merge "Fix build." into cw-d-mr1-dev 2015-05-21 02:41:08 +00:00
Filip Gruszczynski
c1b736a0cd Fix build.
Change-Id: I49f669ee8eed53cf2fc30077cf0a066312865733
2015-05-20 19:40:27 -07:00
Filip Gruszczynski
cb89ac84c6 Merge "Support for devices with a chin." into cw-d-mr1-dev 2015-05-20 22:41:44 +00:00
Filip Gruszczynski
3e11bf33a6 Support for devices with a chin.
Information about the chin is now part of the config.xml instead of the
theme. It is retrieved by WindowManagerService and passed to the clients
as insets. Clients can adjust their behavior in a way that makes it
invisible to the user, that part of the surface doesn't actually exist.

Bug: 19908853

Change-Id: Iedf57bf3c848201b854f91ffeb3b59187d375c1f
2015-05-20 14:20:30 -07:00
Cedric Ho
80cf221022 Add config_forceVoiceInteractionServicePackage to allow a device to config its VoiceInteractionService package and ignore the regular setting.
Change-Id: Ic40d90f1a7a9942f5e82080668552239bbed9b03
2015-05-20 13:50:22 -07:00
Joe LaPenna
627f26817f Merge "Wait for KEY_SLEEP UP event before calling goToSleep()" into lmp-mr1-modular-dev 2015-05-14 20:55:19 +00:00
John Reck
951f23478d am d955dceb: am 862540cd: Merge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into lmp-mr1-dev
* commit 'd955dceb4f38f214e62024e808b2b1a21be41940':
  Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
2015-05-14 01:05:47 +00:00
John Reck
d955dceb4f am 862540cd: Merge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into lmp-mr1-dev
* commit '862540cdb11a7128ae1fd670136f398645b4af7b':
  Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
2015-05-14 00:51:07 +00:00
John Reck
862540cdb1 Merge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into lmp-mr1-dev 2015-05-14 00:40:45 +00:00
John Reck
e869835d6a am a5b28b92: am 69355eaa: Merge "DO NOT MERGE Backport of limited jank-tracking metrics" into lmp-mr1-dev
* commit 'a5b28b92b14d0949d43be6198fedc31872ad07f6':
  DO NOT MERGE Backport of limited jank-tracking metrics
2015-05-13 22:07:15 +00:00
John Reck
a5b28b92b1 am 69355eaa: Merge "DO NOT MERGE Backport of limited jank-tracking metrics" into lmp-mr1-dev
* commit '69355eaa1c1f4bfc961d5dd9fdb0f3817d36d5f0':
  DO NOT MERGE Backport of limited jank-tracking metrics
2015-05-13 21:52:50 +00:00
John Reck
25607a6642 Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
This reverts commit 2614bd225f84f7a23e6b30fc6b47bede153e5f4c.

Change-Id: I344b4cbaa0bb0caf50bceb806d1446ee27ea52d8
2015-05-13 21:42:28 +00:00
John Reck
69355eaa1c Merge "DO NOT MERGE Backport of limited jank-tracking metrics" into lmp-mr1-dev 2015-05-13 21:42:13 +00:00
Joe LaPenna
0cbd0cbd13 Merge "Reduce display device log spam." into lmp-mr1-modular-dev 2015-05-13 01:26:26 +00:00
Wei Liu
3d76e2f35a Merge "Create GpsLocationProvider only if GPS is supported." into lmp-mr1-modular-dev 2015-05-12 18:54:11 +00:00
Christopher Tate
960cb4816c am 613626b7: am afd883f8: During early boot, send LOCALE_CHANGED only to registered receivers
* commit '613626b7488c5c35a4816804fbe8f837a7e30440':
  During early boot, send LOCALE_CHANGED only to registered receivers
2015-05-12 15:53:04 +00:00
Christopher Tate
613626b748 am afd883f8: During early boot, send LOCALE_CHANGED only to registered receivers
* commit 'afd883f8a3ee260a5505f83d628c0b789871c837':
  During early boot, send LOCALE_CHANGED only to registered receivers
2015-05-12 15:39:12 +00:00
Christopher Tate
afd883f8a3 During early boot, send LOCALE_CHANGED only to registered receivers
Bug 20855725
Bug 19060618

Change-Id: I368660ecc6ee97a0c2a2f627fa1b09288bc92bd1
2015-05-11 18:00:45 -07:00
Wei Liu
5241a4cb55 Create GpsLocationProvider only if GPS is supported.
The creation of GpsLocationProvider used to be inside the
GpsLocationProvider.isSupported() check.

https://googleplex-android-review.git.corp.google.com/#/c/288260/8/services/java/com/android/server/LocationManagerService.java
incorrectly moved it out.

b/20949616

Change-Id: I6ddd5be5a78f3156a4d5cfc4c756930558c3a8fc
2015-05-11 17:39:49 -07:00
Christopher Tate
4f35e1699a am 4475e7df: am ea2c4033: Mark persistent apps as such when the ProcessRecord is created
* commit '4475e7dfa12e684df64c59a9053c110d79d83c1f':
  Mark persistent apps as such when the ProcessRecord is created
2015-05-08 22:14:53 +00:00
Christopher Tate
4475e7dfa1 am ea2c4033: Mark persistent apps as such when the ProcessRecord is created
* commit 'ea2c403311f741f5a0a9688847cfd17041c81c0d':
  Mark persistent apps as such when the ProcessRecord is created
2015-05-08 21:55:08 +00:00
Christopher Tate
ea2c403311 Mark persistent apps as such when the ProcessRecord is created
...rather than only during the OS's "time to start the persistent apps"
boot phase.  This closes a window of opportunity during which a
persistent app container may be live without having been properly
noted as such, because it wound up being launched prior to the
[rather late] boot phase at which the persistent apps are directly
enumerated and bookkeeping for them established.

Bug 20855725

Change-Id: I41822b412de4540dbdeab300b38089303678f76c
2015-05-08 13:05:42 -07:00
Christopher Ferris
504bb9e770 Merge "Temporarily increase saved tombstone size. DO NOT MERGE" into lmp-mr1-modular-dev 2015-05-07 19:19:33 +00:00