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

193135 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andres Morales
5ccfe51d8b Merge "[LockSettings] migrate password attempt throttling to hardware" into mnc-dev 2015-05-27 18:37:32 +00:00
Julia Reynolds
77aa9afe0c Merge "Fallback to priority activity if preferred activity not available." into mnc-dev 2015-05-27 18:28:42 +00:00
Alan Viverette
d0699fa569 Merge "Avoid strict mode violation during saveAttributeData" into mnc-dev 2015-05-27 18:00:18 +00:00
Cedric Ho
2b919d4f69 Merge "Add getCallingUid() to RecognitionService.Callback." into mnc-dev 2015-05-27 17:46:41 +00:00
John Reck
302abd2246 Merge "Enable swapBuffersWithDamage by default" into mnc-dev 2015-05-27 17:39:18 +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
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
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
Mike Colagrosso
6eea30c422 Merge "Android Training: Add missing word" into lmp-docs 2015-05-27 15:04:48 +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
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
Joe Fernandez
63c2b34b08 am f47dc2cc: Merge "docs: M Preview - fix SDK Setup instructions with MNC vs android-MNC" into mnc-preview-docs 
* commit 'f47dc2cc0a73b32c71e8afdedb9b100a889b52f6':
  docs: M Preview - fix SDK Setup instructions with MNC vs android-MNC
 2015-05-27 01:28:01 +00:00
David Friedman
1b1fce8001 am 7311d2e2: Merge "Docs: "Tombstone" for old NDK page, directing visitors to new NDK site." into mnc-preview-docs 
* commit '7311d2e267ab2444afe93f2c48742f858251ae2e':
  Docs: "Tombstone" for old NDK page, directing visitors to new NDK site.
 2015-05-27 01:27:57 +00:00
Dirk Dougherty
001701ae21 am 493ff3cb: Doc change: move data binding library to tools tab. 
* commit '493ff3cb8f0c6f7729763f7d4a8571c0955d6f4b':
  Doc change: move data binding library to tools tab.
 2015-05-27 01:27:52 +00:00
Guang Zhu
4f486ee696 don't report missing launch intent as failure 
Some apks includes widgets and does not have a launchable
activity. The inclusion of such apk for launching is an issue
with test configuration, not test failure.

Also logging intent used for app package for debugging purpose.

Change-Id: Ibca05757a401ea036e9910d8580d7cafd356567c
 2015-05-26 18:26:46 -07:00
Joe Fernandez
f47dc2cc0a Merge "docs: M Preview - fix SDK Setup instructions with MNC vs android-MNC" into mnc-preview-docs 2015-05-27 00:03:09 +00:00
David Friedman
7311d2e267 Merge "Docs: "Tombstone" for old NDK page, directing visitors to new NDK site." into mnc-preview-docs 2015-05-26 23:58:58 +00:00
Dirk Dougherty
493ff3cb8f Doc change: move data binding library to tools tab. 
Change-Id: I74817864dc6fe390cb52ec2ea52ee1ea3a46c830
 2015-05-26 16:52:23 -07:00
David Friedman
d91b1d526e Docs: "Tombstone" for old NDK page, directing visitors to new NDK site. 
Change-Id: I520bfb5157b2ffed5baa182df7c6305bf8835360
 2015-05-26 16:37:02 -07:00
Svetoslav
80ce4ad644 Merge "Clear binder id after a permissions check before killing a UID." into mnc-dev 2015-05-26 22:49:12 +00:00