Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
172,808 Commits 3 Branches 0 Tags
7e956811fc596eb53753a3daa2210d093537686e
Commit Graph

5070 Commits

Author SHA1 Message Date
Pete Gast
2f6cd6489f am 2ad988aa: am 642b4d93: am 705c9c13: Merge "Expand WearableExtender to customize labels." into lmp-mr1-dev 
* commit '2ad988aa6e6f7fa89affcfc5b81ac3c28ea525ee':
  Expand WearableExtender to customize labels.
 2014-11-10 16:48:29 +00:00
Pete Gast
2ad988aa6e am 642b4d93: am 705c9c13: Merge "Expand WearableExtender to customize labels." into lmp-mr1-dev 
* commit '642b4d93b9ce73866d7985172d31661a55aed7be':
  Expand WearableExtender to customize labels.
 2014-11-10 16:45:02 +00:00
Pete Gast
705c9c131a Merge "Expand WearableExtender to customize labels." into lmp-mr1-dev 2014-11-10 16:35:57 +00:00
Alexandra Gherghina
0695ba054e am 40345df2: am e5332972: am 72e32fd5: Merge "Clarify documentation for DevicePolicyManager" into lmp-mr1-dev 
* commit '40345df2768f61d7f5e8e93e1d3b67e32c129498':
  Clarify documentation for DevicePolicyManager
 2014-11-10 14:36:14 +00:00
Alexandra Gherghina
40345df276 am e5332972: am 72e32fd5: Merge "Clarify documentation for DevicePolicyManager" into lmp-mr1-dev 
* commit 'e5332972119319c747976f0e7dbee6388295b937':
  Clarify documentation for DevicePolicyManager
 2014-11-10 14:30:14 +00:00
Alexandra Gherghina
541afcd0b7 Clarify documentation for DevicePolicyManager 
Bug: 17634106
Change-Id: I93e4c10cb942bc8452043f81f460a5db6c3bd0a4
 2014-11-10 10:22:47 +00:00
Amith Yamasani
78673cc6aa am 1aeab291: Merge "Inform PendingIntent sender if broadcast was not queued." into lmp-mr1-dev automerge: 395b519 
automerge: 2a21f24

* commit '2a21f247885780d90873bb25aa7c7f710e4bffcc':
  Inform PendingIntent sender if broadcast was not queued.
 2014-11-08 03:05:45 +00:00
Amith Yamasani
2a21f24788 am 1aeab291: Merge "Inform PendingIntent sender if broadcast was not queued." into lmp-mr1-dev automerge: 395b519 
* commit '1aeab291764b77ffa2c6e6eb28441beec6fa041c':
  Inform PendingIntent sender if broadcast was not queued.
 2014-11-08 02:59:55 +00:00
Amith Yamasani
395b519f4b Merge "Inform PendingIntent sender if broadcast was not queued." into lmp-mr1-dev 2014-11-08 01:39:12 +00:00
Amith Yamasani
83b6ef01a0 Inform PendingIntent sender if broadcast was not queued. 
If the broadcast could not be queued due to a stopped user, the
party trying to send a PendingIntent should be notified right away.
Otherwise, for instance, AlarmManager could be waiting forever to
be called back after the broadcast is delivered.

This is a potential fix for:
Bug: 18290018

Change-Id: I07c0751e80f11e69dfa2be5c96a033aecb298b81
 2014-11-07 15:34:04 -08:00
Christopher Tate
be98cdce1c am b63fd56b: am e5205d1a: am 48a7c3b5: Merge "Enable runtime turndown of backup/restore services" into lmp-mr1-dev 
* commit 'b63fd56b396dab177959ee33fe41ff40ff5c3c7f':
  Enable runtime turndown of backup/restore services
 2014-11-07 23:13:29 +00:00
Christopher Tate
b63fd56b39 am e5205d1a: am 48a7c3b5: Merge "Enable runtime turndown of backup/restore services" into lmp-mr1-dev 
* commit 'e5205d1ae491a97197d12fc2bc5afe1a449cf75d':
  Enable runtime turndown of backup/restore services
 2014-11-07 23:08:49 +00:00
Christopher Tate
48a7c3b522 Merge "Enable runtime turndown of backup/restore services" into lmp-mr1-dev 2014-11-07 23:00:24 +00:00
Sander Alewijnse
c4ba217474 am 1b0dbd5c: am 8c1cd7e6: am 3eed90f3: Merge "Added the restrictions pending application restrictions key." into lmp-mr1-dev 
* commit '1b0dbd5c954b61e2ee95f87817a1ec0e7d242b20':
  Added the restrictions pending application restrictions key.
 2014-11-07 22:39:38 +00:00
Sander Alewijnse
1b0dbd5c95 am 8c1cd7e6: am 3eed90f3: Merge "Added the restrictions pending application restrictions key." into lmp-mr1-dev 
* commit '8c1cd7e61f050afd450cb05add633e2fbe0b195a':
  Added the restrictions pending application restrictions key.
 2014-11-07 22:35:51 +00:00
Sander Alewijnse
3eed90f393 Merge "Added the restrictions pending application restrictions key." into lmp-mr1-dev 2014-11-07 22:25:00 +00:00
Sander Alewijnse
53d63dcd04 Added the restrictions pending application restrictions key. 
Bug:17632522
Change-Id: If5a0d0ea1f479b0584fc0b1cff2a179d296d2904
 2014-11-07 22:19:48 +00:00
Christopher Tate
bbe23b31dc Enable runtime turndown of backup/restore services 
The heavy implementation of the backup manager service is now sitting
behind a lightweight trampoline that actually provides the binder
call interface.  The indirection allows us now to tear down the
implementation on the fly without breaking callers who have cached
binder references to the backup services: these callers will simply
see their future invocations failing benignly.

In addition there is now an API for suitably privileged callers such
as device policy management to effect this turndown.

Finally, there is now a static system property, "ro.backup.disable",
that a product can use to outright remove backup/restore operation
from the system's operation.  The public APIs will continue to be
safely usable on such products but no data will be moved to or
from the device.

Bug 17367491

Change-Id: I8108e386ef3b5c967938fae483366d6978fe4e04
 2014-11-07 18:40:47 +00:00
Winson Chung
c5f9ec3e27 am 675a0b6b: am 513aa792: am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev 
* commit '675a0b6bc9ee2f2e80f28381c0f34d98e0447ad6':
  Adding bounce animation for affiliated tasks. (Bug 16656169)
 2014-11-07 04:17:02 +00:00
Winson Chung
675a0b6bc9 am 513aa792: am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev 
* commit '513aa79290dd17400c4cce82d1d801c05ff3776f':
  Adding bounce animation for affiliated tasks. (Bug 16656169)
 2014-11-07 01:45:11 +00:00
Winson Chung
3ed9f2f903 Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev 2014-11-07 01:30:20 +00:00
Winson Chung
044d52934e Adding bounce animation for affiliated tasks. (Bug 16656169) 
Change-Id: I39e4a57c4e6b707d15513dacde2d40c23bb05058
 2014-11-06 14:02:35 -08:00
Jim Miller
cc56956025 am 767ae175: am 6230cdf5: am 262dc4da: Merge "Update TrustAgentService API after review" into lmp-mr1-dev 
* commit '767ae175fab5a93f4948b3722549448eb4b55e41':
  Update TrustAgentService API after review
 2014-11-06 03:12:08 +00:00
Jim Miller
767ae175fa am 6230cdf5: am 262dc4da: Merge "Update TrustAgentService API after review" into lmp-mr1-dev 
* commit '6230cdf5721f11660e2c0fec1c5695346a9001d0':
  Update TrustAgentService API after review
 2014-11-06 03:07:09 +00:00
Jim Miller
262dc4dafe Merge "Update TrustAgentService API after review" into lmp-mr1-dev 2014-11-06 02:52:20 +00:00
Jim Miller
e303bf4435 Update TrustAgentService API after review 
This change incorporates API council feedback and enables the
TrustAgent whitelisting API.

It also contains a minor cleanup of DPM's use of UserHandle
to eliminate unnecessary object creation.

Fixes bug 17008504

Change-Id: I63cc50169fde54b34406845818bcaf6aadc1a3db
 2014-11-05 18:17:56 -08:00
Wale Ogunwale
a9868fbd7b am 2749a5e6: am e54553c8: am d54b578e: Fix issue #17305377: Don\'t kill process if it still has tasks. 
* commit '2749a5e6cec41cbdc019134db6fc96e5283db9b4':
  Fix issue #17305377: Don't kill process if it still has tasks.
 2014-11-04 19:22:25 +00:00
Wale Ogunwale
2749a5e6ce am e54553c8: am d54b578e: Fix issue #17305377: Don\'t kill process if it still has tasks. 
* commit 'e54553c841f3ca1ebcb822e8b9ab6a412e7bd895':
  Fix issue #17305377: Don't kill process if it still has tasks.
 2014-11-04 19:14:49 +00:00
Wale Ogunwale
d54b578e47 Fix issue #17305377: Don't kill process if it still has tasks. 
We previously killed a process when one of its task was
swiped away in the recents UI. This had negative performance
implications for apps with multiple tasks in recents. Now we
will only kill the process if there are no more tasks associated
with it.

Changed also removes the need for the
ActivityManager.REMOVE_TASK_KILL_PROCESS since ActivityManager
will now only kill a task process if it process has no out
standing tasks.

Bug: 17305377
Change-Id: Ibc39bb328d13c7eab05c04798c2f14887923d9d4
 2014-11-04 10:59:31 -08:00
Griff Hazen
f7936df688 am 472b990a: am 07e8b2fb: am 9c95015b: Merge "Improve support for the barcode-on-screen use case for wearables." into lmp-mr1-dev 
* commit '472b990ae11f4ae4c16d90cbb02e9efa868db382':
  Improve support for the barcode-on-screen use case for wearables.
 2014-11-04 15:37:00 +00:00
Griff Hazen
472b990ae1 am 07e8b2fb: am 9c95015b: Merge "Improve support for the barcode-on-screen use case for wearables." into lmp-mr1-dev 
* commit '07e8b2fb7409f0893d13a6cfb4687ba70b220e91':
  Improve support for the barcode-on-screen use case for wearables.
 2014-11-04 15:33:17 +00:00
Griff Hazen
9c95015b0c Merge "Improve support for the barcode-on-screen use case for wearables." into lmp-mr1-dev 2014-11-04 15:23:21 +00:00
Griff Hazen
5f2edfc12c Improve support for the barcode-on-screen use case for wearables. 
Add two small developer apis to wearable extender to help developers
show barcodes on different shaped wearable screens.

Bug: 16299175
Bug: 17005635

Change-Id: I05088ffcc405c69f1e8df7bf967ea930548c7d51
 2014-11-03 09:53:54 -08:00
Narayan Kamath
3455c5c93e am 4a51d064: am 9301eafb: Merge "Fix getPackageInfo("android") in the system server." into lmp-mr1-dev automerge: 726e9ea 
* commit '4a51d06402ae59b49cf0e99d05a82f71500ffe08':
  Fix getPackageInfo("android") in the system server.
 2014-11-03 12:57:39 +00:00
Narayan Kamath
4a51d06402 am 9301eafb: Merge "Fix getPackageInfo("android") in the system server." into lmp-mr1-dev 
automerge: 726e9ea

* commit '726e9ea7322d5122a22a0077d58ae92870962df4':
  Fix getPackageInfo("android") in the system server.
 2014-11-03 12:52:14 +00:00
Narayan Kamath
9301eafbcc Merge "Fix getPackageInfo("android") in the system server." into lmp-mr1-dev 2014-11-03 12:45:16 +00:00
George Mount
486384ef46 am 0d6624d3: am fa21e757: Merge "Ensure views are attached prior to starting enter transition." into lmp-mr1-dev automerge: 7bce500 
* commit '0d6624d35af7c7623cf97084753255079b01fbdf':
  Ensure views are attached prior to starting enter transition.
 2014-10-31 21:43:21 +00:00
George Mount
0d6624d35a am fa21e757: Merge "Ensure views are attached prior to starting enter transition." into lmp-mr1-dev 
automerge: 7bce500

* commit '7bce5007d2b2b218d11514a3df8e7109e37d9e7c':
  Ensure views are attached prior to starting enter transition.
 2014-10-31 21:38:13 +00:00
George Mount
fa21e75734 Merge "Ensure views are attached prior to starting enter transition." into lmp-mr1-dev 2014-10-31 21:30:20 +00:00
Sander Alewijnse
fc3ddf1107 am a1ceb929: am 94efda63: am a0edff4e: Merge "Change javadoc of setAccountManagementDisabled." into lmp-mr1-dev 
* commit 'a1ceb92964612fca32bcd83e07b26e72994afca2':
  Change javadoc of setAccountManagementDisabled.
 2014-10-31 10:26:03 +00:00
Sander Alewijnse
a1ceb92964 am 94efda63: am a0edff4e: Merge "Change javadoc of setAccountManagementDisabled." into lmp-mr1-dev 
* commit '94efda638e9789cacfbdffae6c6d6fae1dd41667':
  Change javadoc of setAccountManagementDisabled.
 2014-10-31 10:20:08 +00:00
Sander Alewijnse
a0edff4e94 Merge "Change javadoc of setAccountManagementDisabled." into lmp-mr1-dev 2014-10-31 10:05:36 +00:00
George Mount
6ced4faf69 am 104257ba: am cfff5427: am 57928195: Merge "Fix NPE when snapshot ImageView uses ScaleType.MATRIX." into lmp-mr1-dev 
* commit '104257bac6dfd677a2f0a36467d5a42eef27e597':
  Fix NPE when snapshot ImageView uses ScaleType.MATRIX.
 2014-10-31 00:43:37 +00:00
George Mount
104257bac6 am cfff5427: am 57928195: Merge "Fix NPE when snapshot ImageView uses ScaleType.MATRIX." into lmp-mr1-dev 
* commit 'cfff54270b7b09e66eb618b51706c3f8779fb110':
  Fix NPE when snapshot ImageView uses ScaleType.MATRIX.
 2014-10-31 00:38:48 +00:00
Jeff Hao
ab3ff04d52 am 05ea3213: am 73577862: am b1346d78: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev 
* commit '05ea3213fd68204aa7cd9cc4b9b6a0a973f69c17':
  Change boot screen title to "Android is starting" when not upgrading.
 2014-10-31 00:00:57 +00:00
Jeff Hao
05ea3213fd am 73577862: am b1346d78: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev 
* commit '73577862ffe6332f326628febfa1fbb9e693bb40':
  Change boot screen title to "Android is starting" when not upgrading.
 2014-10-30 23:44:09 +00:00
George Mount
1fb941dd4f Ensure views are attached prior to starting enter transition. 
Bug 17964119

Change-Id: Ic4ecd5aa9a3bbe5565381b8d9b3c79dd47720e5d
 2014-10-30 12:30:12 -07:00
George Mount
ca5094a05c Fix NPE when snapshot ImageView uses ScaleType.MATRIX. 
Bug 18170774

Change-Id: I28497f569f8a40242191196f059d8f40d17d52d6
 2014-10-30 12:21:00 -07:00
Sander Alewijnse
112e053b9a Change javadoc of setAccountManagementDisabled. 
Method can also be called by device owner.

Bug:18166033
Change-Id: I38ab17bdfe9f0c4b33f5257d2f335afe16e84031
 2014-10-30 14:54:28 +00:00
Jeff Hao
9f60c08a44 Change boot screen title to "Android is starting" when not upgrading. 
Bug: 17565501
Change-Id: Id5741e6e7a40750feee1cd7306e79f7baeec67de
 2014-10-29 14:42:39 -07:00