drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
193,355 Commits 1 Branch 0 Tags
Commit Graph

193355 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alan Viverette
165229ba41 Merge "Add workaround for measuring stacked button bar layout" into mnc-dev 2015-05-27 17:30:45 +00:00
John Reck
4cd44f8110 Enable swapBuffersWithDamage by default 
Bug: 20761426

Change-Id: I520e60ca4f182dea590bc86eebd522e1db7a018a
 2015-05-27 10:28:28 -07:00
Alan Viverette
cffaf7e7e4 Add workaround for measuring stacked button bar layout 
Bug: 21300645
Change-Id: If9544da4995c3dce118dd9e36d42764662b3aecd
 2015-05-27 10:28:05 -07:00
Andrew Solovay
b7227c2bf9 Merge "docs: Fixing typo on Auto Backup for Apps page." into mnc-preview-docs 2015-05-27 17:23:57 +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
David Friedman
be4fc248b7 Merge "Docs: Final, master CL for NDK-docs-to-DAC for IO: "Guides," "Downloads" tabs." into mnc-preview-docs 2015-05-27 17:16:34 +00:00
Cedric Ho
8fedcdad36 Add getCallingUid() to RecognitionService.Callback. 
Change-Id: I596471625eee24ec93d08650c33461d35ad0aa07
 2015-05-27 09:51:19 -07:00
Geoff Mendal
07491cb93c Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-27 16:41:18 +00:00
Geoff Mendal
27ec560356 Import translations. DO NOT MERGE 
Change-Id: I75401e1e66e9793ea4be891b4ef6afcf9811184a
Auto-generated-cl: translation import
 2015-05-27 09:35:53 -07:00
Ben Kwa
7c0ade56f3 Ensure that the copy notification is always cancelable. 
If the CopyService dies or is stopped for whatever reason, the cached
"current" job ID will go to null.  In that case, the cancel intent will
be ignored, and the copy notification can never be dismissed.  Adding a
null check to the handleCancel method of CopyService fixes this.

BUG=21365043
Change-Id: I0615328f6033a313fec79f8b63291c7f7373ea0f
 2015-05-27 09:19:28 -07:00
Quddus Chong
8525b8a8b5 Merge "docs: Remove Google Play Services pages under Develop > Google Services. bug: 21407467" into mnc-preview-docs 2015-05-27 16:16:57 +00:00
Mike Colagrosso
6ffab1bd65 am f77b748c: am 31a48820: am 1c673f9a: am 6eea30c4: Merge "Android Training: Add missing word" into lmp-docs 
* commit 'f77b748caa2795296866c1c9c30385819ffca835':
  Android Training: Add missing word
 2015-05-27 16:06:48 +00:00
Mike Colagrosso
f77b748caa am 31a48820: am 1c673f9a: am 6eea30c4: Merge "Android Training: Add missing word" into lmp-docs 
* commit '31a48820aa858770cb1f1b3ce32a550565c83546':
  Android Training: Add missing word
 2015-05-27 15:53:03 +00:00
Mike Colagrosso
31a48820aa am 1c673f9a: am 6eea30c4: Merge "Android Training: Add missing word" into lmp-docs 
* commit '1c673f9abe8b6d931456ce6709c9b00cdb5d11ca':
  Android Training: Add missing word
 2015-05-27 15:38:37 +00:00
Mike Colagrosso
1c673f9abe am 6eea30c4: Merge "Android Training: Add missing word" into lmp-docs 
* commit '6eea30c422811da1b989500147afb82b5f2d45e0':
  Android Training: Add missing word
 2015-05-27 15:23:36 +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
Mike Colagrosso
6eea30c422 Merge "Android Training: Add missing word" into lmp-docs 2015-05-27 15:04:48 +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
Julia Reynolds
843f648c82 Fallback to priority activity if preferred activity not available. 
Bug: 21434199
Change-Id: I1f268700219dea7f9ed02bda320923f49a5a3457
 2015-05-27 09:02:18 -04:00
Sudheer Shanka
81c73e121e Merge "Clear caller identity before setting all the user restrictions." into mnc-dev 2015-05-27 11:25:33 +00:00
David Friedman
14d1777383 Docs: Final, master CL for NDK-docs-to-DAC for IO: "Guides," "Downloads" tabs. 
Change-Id: Ifeeb0f55ef849cf6fd262858fae1dc0f45e7aa52
 2015-05-27 02:42:00 -07:00
Wale Ogunwale
0f22ec9777 am 21531bce: am 57141700: am 0f771240: am bf0439a7: am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS 
* commit '21531bce0e8848311c7f8caceeee3b988c7396f4':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
 2015-05-27 06:21:15 +00:00
Wale Ogunwale
21531bce0e am 57141700: am 0f771240: am bf0439a7: am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS 
* commit '5714170091065bb51f33c8f3ce272db07f69a21b':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
 2015-05-27 06:06:51 +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
Johan Euphrosine
625119f369 am 54856cc7: am a08a26c6: Merge "frameworks/base/docs/ndk: add files in reference_toc" into mnc-preview-docs 
* commit '54856cc75f5dbbfa18aa0f84b69fbcaad7c25cc4':
  frameworks/base/docs/ndk: add files in reference_toc
 2015-05-27 05:10:27 +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
Johan Euphrosine
54856cc75f am a08a26c6: Merge "frameworks/base/docs/ndk: add files in reference_toc" into mnc-preview-docs 
* commit 'a08a26c661d8cd31f3465ff8fa7356bcdad996a8':
  frameworks/base/docs/ndk: add files in reference_toc
 2015-05-27 04:57:05 +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
Johan Euphrosine
a08a26c661 Merge "frameworks/base/docs/ndk: add files in reference_toc" into mnc-preview-docs 2015-05-27 04:43:22 +00:00
Johan Euphrosine
72b938123f frameworks/base/docs/ndk: add files in reference_toc 
Change-Id: Id5abb6e1eba9f5c829510e8c83dcc36f616cda6c
 2015-05-26 21:40:07 -07:00
Dirk Dougherty
ea8ace5ec4 am 7f0eaefe: am c2e34345: Doc change: update gcm logo in card image. 
* commit '7f0eaefe8bf6a9ff1ebc8c726cc91dfc0de3185c':
  Doc change: update gcm logo in card image.
 2015-05-27 04:21:24 +00:00
Dirk Dougherty
7f0eaefe8b am c2e34345: Doc change: update gcm logo in card image. 
* commit 'c2e343456e65fde54d1e9f54645030fe11fad585':
  Doc change: update gcm logo in card image.
 2015-05-27 04:05:42 +00:00
Dirk Dougherty
bf3afdb8db am 3b1c69cf: am ea1f6fb3: Doc change: edits and fixes to data binding guide. 
* commit '3b1c69cfd050c083d4066f483d293875a7b44b90':
  Doc change: edits and fixes to data binding guide.
 2015-05-27 03:58:37 +00:00
Dirk Dougherty
c2e343456e Doc change: update gcm logo in card image. 
Change-Id: Id55a16aa0fdef874106e2a7ee75c472ad6cca3c6
 2015-05-26 20:51:04 -07:00
Dirk Dougherty
3b1c69cfd0 am ea1f6fb3: Doc change: edits and fixes to data binding guide. 
* commit 'ea1f6fb385d6f8d19ef18b196b9749dfc74e6cdc':
  Doc change: edits and fixes to data binding guide.
 2015-05-27 03:45:29 +00:00
Dirk Dougherty
ea1f6fb385 Doc change: edits and fixes to data binding guide. 
Change-Id: Iaef989bd48a99294e2032656653e71ef93313687
 2015-05-26 20:31:52 -07:00
Joe Fernandez
617c2999de am 63c2b34b: am f47dc2cc: Merge "docs: M Preview - fix SDK Setup instructions with MNC vs android-MNC" into mnc-preview-docs 
* commit '63c2b34b085018634341ece7eaaf6f07c213356e':
  docs: M Preview - fix SDK Setup instructions with MNC vs android-MNC
 2015-05-27 03:15:16 +00:00
David Friedman
dadb9cb392 am 1b1fce80: am 7311d2e2: Merge "Docs: "Tombstone" for old NDK page, directing visitors to new NDK site." into mnc-preview-docs 
* commit '1b1fce8001002987d8c163f959639015449f2f5b':
  Docs: "Tombstone" for old NDK page, directing visitors to new NDK site.
 2015-05-27 03:15:10 +00:00
Dirk Dougherty
64aa569ec8 Merge "Merge commit '001701ae' into manualmergetoday" into mnc-dev 2015-05-27 03:12:18 +00:00
Dirk Dougherty
143c94d0b2 Merge commit '001701ae' into manualmergetoday 
Change-Id: I78845c61426efe8a0607bbf958e49852a9b62b75
 2015-05-26 20:10:17 -07:00
Guang Zhu
62267e0f9e Merge "don't report missing launch intent as failure" into mnc-dev 2015-05-27 03:08:31 +00:00
Andres Morales
2397427cb1 [LockSettings] migrate password attempt throttling to hardware 
leverage root protected, cryptographically secured hardware
if available

Bug: 21118563
Change-Id: Ifa804c5a0728bfd14466eb2a84051bace6d33d57
 2015-05-26 19:48:51 -07:00