OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 8141d6e1: Merge "Use DeviceDefault (dark) theme for PrintActivity" into mnc-dev
Alan Viverette [Wed, 27 May 2015 20:23:30 +0000 (20:23 +0000)]
am 8141d6e1: Merge "Use DeviceDefault (dark) theme for PrintActivity" into mnc-dev

* commit '8141d6e1509a586e2954fbece04e64aaa02092a2':
  Use DeviceDefault (dark) theme for PrintActivity

9 years agoam 1ec5e308: Merge "Fix assert when dumping view at 0 alpha" into mnc-dev
Chris Craik [Wed, 27 May 2015 20:23:23 +0000 (20:23 +0000)]
am 1ec5e308: Merge "Fix assert when dumping view at 0 alpha" into mnc-dev

* commit '1ec5e308a913cd0c54d58fd797274485664781c1':
  Fix assert when dumping view at 0 alpha

9 years agoam 1e6d566c: Merge "Fix GL texture binding for TextureViews" into mnc-dev
Chris Craik [Wed, 27 May 2015 20:23:18 +0000 (20:23 +0000)]
am 1e6d566c: Merge "Fix GL texture binding for TextureViews" into mnc-dev

* commit '1e6d566c5f8500e3639a8f8ceebf0226c07efc13':
  Fix GL texture binding for TextureViews

9 years agoam 06c88b60: Merge "Fix typo in Javadocs of KeyGenParameterSpec." into mnc-dev
Alex Klyubin [Wed, 27 May 2015 20:23:14 +0000 (20:23 +0000)]
am 06c88b60: Merge "Fix typo in Javadocs of KeyGenParameterSpec." into mnc-dev

* commit '06c88b60efd12d3e81c7a9c53d8b995e23d04c5a':
  Fix typo in Javadocs of KeyGenParameterSpec.

9 years agoam 5ccfe51d: Merge "[LockSettings] migrate password attempt throttling to hardware...
Andres Morales [Wed, 27 May 2015 20:23:05 +0000 (20:23 +0000)]
am 5ccfe51d: Merge "[LockSettings] migrate password attempt throttling to hardware" into mnc-dev

* commit '5ccfe51d8b9ae4f73a3b0fdb553b807cf5691582':
  [LockSettings] migrate password attempt throttling to hardware

9 years agoam 77aa9afe: Merge "Fallback to priority activity if preferred activity not available...
Julia Reynolds [Wed, 27 May 2015 20:22:59 +0000 (20:22 +0000)]
am 77aa9afe: Merge "Fallback to priority activity if preferred activity not available." into mnc-dev

* commit '77aa9afe0c67ca7285ed81664571f3d6f567eb9b':
  Fallback to priority activity if preferred activity not available.

9 years agoam d0699fa5: Merge "Avoid strict mode violation during saveAttributeData" into mnc-dev
Alan Viverette [Wed, 27 May 2015 20:22:55 +0000 (20:22 +0000)]
am d0699fa5: Merge "Avoid strict mode violation during saveAttributeData" into mnc-dev

* commit 'd0699fa5697ba43c64c142ee67b245e0a346acfe':
  Avoid strict mode violation during saveAttributeData

9 years agoMerge "Use DeviceDefault (dark) theme for PrintActivity" into mnc-dev
Alan Viverette [Wed, 27 May 2015 19:26:25 +0000 (19:26 +0000)]
Merge "Use DeviceDefault (dark) theme for PrintActivity" into mnc-dev

9 years agoMerge "Fix assert when dumping view at 0 alpha" into mnc-dev
Chris Craik [Wed, 27 May 2015 19:22:43 +0000 (19:22 +0000)]
Merge "Fix assert when dumping view at 0 alpha" into mnc-dev

9 years agoMerge "Fix GL texture binding for TextureViews" into mnc-dev
Chris Craik [Wed, 27 May 2015 19:22:42 +0000 (19:22 +0000)]
Merge "Fix GL texture binding for TextureViews" into mnc-dev

9 years agoUse DeviceDefault (dark) theme for PrintActivity
Alan Viverette [Wed, 27 May 2015 19:17:26 +0000 (12:17 -0700)]
Use DeviceDefault (dark) theme for PrintActivity

Bug: 21433656
Change-Id: If90ba72fb5862f0eb583c8e64642920c49c5fea6

9 years agoMerge "Fix typo in Javadocs of KeyGenParameterSpec." into mnc-dev
Alex Klyubin [Wed, 27 May 2015 18:46:55 +0000 (18:46 +0000)]
Merge "Fix typo in Javadocs of KeyGenParameterSpec." into mnc-dev

9 years agoMerge "[LockSettings] migrate password attempt throttling to hardware" into mnc-dev
Andres Morales [Wed, 27 May 2015 18:37:21 +0000 (18:37 +0000)]
Merge "[LockSettings] migrate password attempt throttling to hardware" into mnc-dev

9 years agoMerge "Fallback to priority activity if preferred activity not available." into mnc-dev
Julia Reynolds [Wed, 27 May 2015 18:28:40 +0000 (18:28 +0000)]
Merge "Fallback to priority activity if preferred activity not available." into mnc-dev

9 years agoFix assert when dumping view at 0 alpha
Chris Craik [Wed, 27 May 2015 18:28:14 +0000 (11:28 -0700)]
Fix assert when dumping view at 0 alpha

bug:21461177

Change-Id: Ib4aba7b9641254012471da44aa804813b9679423

9 years agoFix GL texture binding for TextureViews
Chris Craik [Wed, 27 May 2015 18:06:21 +0000 (11:06 -0700)]
Fix GL texture binding for TextureViews

bug:21431334

Should be explicitly passing target through, to ensure
GL_EXTERNAL_OES textures are bound correctly.

Change-Id: I997672ae292ea7fc016c02a59a3c7c8358ecfe0b

9 years agoam 2b919d4f: Merge "Add getCallingUid() to RecognitionService.Callback." into mnc-dev
Cedric Ho [Wed, 27 May 2015 18:01:09 +0000 (18:01 +0000)]
am 2b919d4f: Merge "Add getCallingUid() to RecognitionService.Callback." into mnc-dev

* commit '2b919d4f69807528a11e38aee1a87507249d8319':
  Add getCallingUid() to RecognitionService.Callback.

9 years agoMerge "Avoid strict mode violation during saveAttributeData" into mnc-dev
Alan Viverette [Wed, 27 May 2015 18:00:14 +0000 (18:00 +0000)]
Merge "Avoid strict mode violation during saveAttributeData" into mnc-dev

9 years agoMerge "Add getCallingUid() to RecognitionService.Callback." into mnc-dev
Cedric Ho [Wed, 27 May 2015 17:46:40 +0000 (17:46 +0000)]
Merge "Add getCallingUid() to RecognitionService.Callback." into mnc-dev

9 years agoam 302abd22: Merge "Enable swapBuffersWithDamage by default" into mnc-dev
John Reck [Wed, 27 May 2015 17:42:56 +0000 (17:42 +0000)]
am 302abd22: Merge "Enable swapBuffersWithDamage by default" into mnc-dev

* commit '302abd22468367bcdeb1f85ea8014fe05ed95610':
  Enable swapBuffersWithDamage by default

9 years agoam 165229ba: Merge "Add workaround for measuring stacked button bar layout" into...
Alan Viverette [Wed, 27 May 2015 17:42:52 +0000 (17:42 +0000)]
am 165229ba: Merge "Add workaround for measuring stacked button bar layout" into mnc-dev

* commit '165229ba417fd77ccbb4feb3bc3c664d2cac7ce5':
  Add workaround for measuring stacked button bar layout

9 years agoMerge "Enable swapBuffersWithDamage by default" into mnc-dev
John Reck [Wed, 27 May 2015 17:39:17 +0000 (17:39 +0000)]
Merge "Enable swapBuffersWithDamage by default" into mnc-dev

9 years agoMerge "Add workaround for measuring stacked button bar layout" into mnc-dev
Alan Viverette [Wed, 27 May 2015 17:30:44 +0000 (17:30 +0000)]
Merge "Add workaround for measuring stacked button bar layout" into mnc-dev

9 years agoEnable swapBuffersWithDamage by default
John Reck [Wed, 27 May 2015 17:26:10 +0000 (10:26 -0700)]
Enable swapBuffersWithDamage by default

Bug: 20761426

Change-Id: I520e60ca4f182dea590bc86eebd522e1db7a018a

9 years agoAdd workaround for measuring stacked button bar layout
Alan Viverette [Wed, 27 May 2015 17:28:05 +0000 (10:28 -0700)]
Add workaround for measuring stacked button bar layout

Bug: 21300645
Change-Id: If9544da4995c3dce118dd9e36d42764662b3aecd

9 years agoam 07491cb9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 27 May 2015 16:54:23 +0000 (16:54 +0000)]
am 07491cb9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '07491cb93c66c0f4a1680dc07eca22dab5455c12':
  Import translations. DO NOT MERGE

9 years agoAdd getCallingUid() to RecognitionService.Callback.
Cedric Ho [Wed, 27 May 2015 16:51:19 +0000 (09:51 -0700)]
Add getCallingUid() to RecognitionService.Callback.

Change-Id: I596471625eee24ec93d08650c33461d35ad0aa07

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 27 May 2015 16:41:15 +0000 (16:41 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 27 May 2015 16:35:53 +0000 (09:35 -0700)]
Import translations. DO NOT MERGE

Change-Id: I75401e1e66e9793ea4be891b4ef6afcf9811184a
Auto-generated-cl: translation import

9 years agoam 6ffab1bd: am f77b748c: am 31a48820: am 1c673f9a: am 6eea30c4: Merge "Android Train...
Mike Colagrosso [Wed, 27 May 2015 16:24:27 +0000 (16:24 +0000)]
am 6ffab1bd: am f77b748c: am 31a48820: am 1c673f9a: am 6eea30c4: Merge "Android Training: Add missing word" into lmp-docs

* commit '6ffab1bd65d2b5cc9e2944712058cb42babaa76b':
  Android Training: Add missing word

9 years agoam f77b748c: am 31a48820: am 1c673f9a: am 6eea30c4: Merge "Android Training: Add...
Mike Colagrosso [Wed, 27 May 2015 16:06:48 +0000 (16:06 +0000)]
am f77b748c: am 31a48820: am 1c673f9a: am 6eea30c4: Merge "Android Training: Add missing word" into lmp-docs

* commit 'f77b748caa2795296866c1c9c30385819ffca835':
  Android Training: Add missing word

9 years agoam 31a48820: am 1c673f9a: am 6eea30c4: Merge "Android Training: Add missing word...
Mike Colagrosso [Wed, 27 May 2015 15:53:03 +0000 (15:53 +0000)]
am 31a48820: am 1c673f9a: am 6eea30c4: Merge "Android Training: Add missing word" into lmp-docs

* commit '31a48820aa858770cb1f1b3ce32a550565c83546':
  Android Training: Add missing word

9 years agoam 1c673f9a: am 6eea30c4: Merge "Android Training: Add missing word" into lmp-docs
Mike Colagrosso [Wed, 27 May 2015 15:38:37 +0000 (15:38 +0000)]
am 1c673f9a: am 6eea30c4: Merge "Android Training: Add missing word" into lmp-docs

* commit '1c673f9abe8b6d931456ce6709c9b00cdb5d11ca':
  Android Training: Add missing word

9 years agoam 6eea30c4: Merge "Android Training: Add missing word" into lmp-docs
Mike Colagrosso [Wed, 27 May 2015 15:23:36 +0000 (15:23 +0000)]
am 6eea30c4: Merge "Android Training: Add missing word" into lmp-docs

* commit '6eea30c422811da1b989500147afb82b5f2d45e0':
  Android Training: Add missing word

9 years agoMerge "Android Training: Add missing word" into lmp-docs
Mike Colagrosso [Wed, 27 May 2015 15:04:47 +0000 (15:04 +0000)]
Merge "Android Training: Add missing word" into lmp-docs

9 years agoFallback to priority activity if preferred activity not available.
Julia Reynolds [Wed, 27 May 2015 13:01:22 +0000 (09:01 -0400)]
Fallback to priority activity if preferred activity not available.

Bug: 21434199
Change-Id: I1f268700219dea7f9ed02bda320923f49a5a3457

9 years agoam 81c73e12: Merge "Clear caller identity before setting all the user restrictions...
Sudheer Shanka [Wed, 27 May 2015 11:34:19 +0000 (11:34 +0000)]
am 81c73e12: Merge "Clear caller identity before setting all the user restrictions." into mnc-dev

* commit '81c73e121ef2ff44a3916628d9ff11385db85bd6':
  Clear caller identity before setting all the user restrictions.

9 years agoMerge "Clear caller identity before setting all the user restrictions." into mnc-dev
Sudheer Shanka [Wed, 27 May 2015 11:25:31 +0000 (11:25 +0000)]
Merge "Clear caller identity before setting all the user restrictions." into mnc-dev

9 years agoam 0f22ec97: am 21531bce: am 57141700: am 0f771240: am bf0439a7: am 02f3cf79: am...
Wale Ogunwale [Wed, 27 May 2015 06:35:01 +0000 (06:35 +0000)]
am 0f22ec97: am 21531bce: am 57141700: am 0f771240: am bf0439a7: am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

* commit '0f22ec9777d94c39364d340b454e99c44cac7d9a':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

9 years agoam 21531bce: am 57141700: am 0f771240: am bf0439a7: am 02f3cf79: am 523a19bf: am...
Wale Ogunwale [Wed, 27 May 2015 06:21:15 +0000 (06:21 +0000)]
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

9 years agoam 57141700: am 0f771240: am bf0439a7: am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdow...
Wale Ogunwale [Wed, 27 May 2015 06:06:51 +0000 (06:06 +0000)]
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

9 years agoam 0f771240: am bf0439a7: am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunni...
Wale Ogunwale [Wed, 27 May 2015 05:52:33 +0000 (05:52 +0000)]
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

9 years agoam bf0439a7: am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesse...
Wale Ogunwale [Wed, 27 May 2015 05:35:52 +0000 (05:35 +0000)]
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

9 years agoam 625119f3: am 54856cc7: am a08a26c6: Merge "frameworks/base/docs/ndk: add files...
Johan Euphrosine [Wed, 27 May 2015 05:26:17 +0000 (05:26 +0000)]
am 625119f3: am 54856cc7: am a08a26c6: Merge "frameworks/base/docs/ndk: add files in reference_toc" into mnc-preview-docs

* commit '625119f369ace53851f6042506a8d31c2c13cbd6':
  frameworks/base/docs/ndk: add files in reference_toc

9 years agoam 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with...
Wale Ogunwale [Wed, 27 May 2015 05:17:55 +0000 (05:17 +0000)]
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

9 years agoam 54856cc7: am a08a26c6: Merge "frameworks/base/docs/ndk: add files in reference_toc...
Johan Euphrosine [Wed, 27 May 2015 05:10:27 +0000 (05:10 +0000)]
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

9 years agoam 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission...
Wale Ogunwale [Wed, 27 May 2015 05:03:29 +0000 (05:03 +0000)]
am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

* commit '523a19bf3df202c58369279fc4e538e9e342c1e7':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

9 years agoam a08a26c6: Merge "frameworks/base/docs/ndk: add files in reference_toc" into mnc...
Johan Euphrosine [Wed, 27 May 2015 04:57:05 +0000 (04:57 +0000)]
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

9 years agoam c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
Wale Ogunwale [Wed, 27 May 2015 04:50:11 +0000 (04:50 +0000)]
am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

* commit 'c9a0c0b90773fded6c251646300231f67c891b78':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS

9 years agoMerge "frameworks/base/docs/ndk: add files in reference_toc" into mnc-preview-docs
Johan Euphrosine [Wed, 27 May 2015 04:43:21 +0000 (04:43 +0000)]
Merge "frameworks/base/docs/ndk: add files in reference_toc" into mnc-preview-docs

9 years agoframeworks/base/docs/ndk: add files in reference_toc
Johan Euphrosine [Sat, 23 May 2015 01:14:51 +0000 (18:14 -0700)]
frameworks/base/docs/ndk: add files in reference_toc

Change-Id: Id5abb6e1eba9f5c829510e8c83dcc36f616cda6c

9 years agoam ea8ace5e: am 7f0eaefe: am c2e34345: Doc change: update gcm logo in card image.
Dirk Dougherty [Wed, 27 May 2015 04:34:37 +0000 (04:34 +0000)]
am ea8ace5e: am 7f0eaefe: am c2e34345: Doc change: update gcm logo in card image.

* commit 'ea8ace5ec43b3e7964949ac504a0f56c480d966a':
  Doc change: update gcm logo in card image.

9 years agoam 7f0eaefe: am c2e34345: Doc change: update gcm logo in card image.
Dirk Dougherty [Wed, 27 May 2015 04:21:24 +0000 (04:21 +0000)]
am 7f0eaefe: am c2e34345: Doc change: update gcm logo in card image.

* commit '7f0eaefe8bf6a9ff1ebc8c726cc91dfc0de3185c':
  Doc change: update gcm logo in card image.

9 years agoam bf3afdb8: am 3b1c69cf: am ea1f6fb3: Doc change: edits and fixes to data binding...
Dirk Dougherty [Wed, 27 May 2015 04:12:56 +0000 (04:12 +0000)]
am bf3afdb8: am 3b1c69cf: am ea1f6fb3: Doc change: edits and fixes to data binding guide.

* commit 'bf3afdb8dbed101b0fb198f4226a8867411e291b':
  Doc change: edits and fixes to data binding guide.

9 years agoam c2e34345: Doc change: update gcm logo in card image.
Dirk Dougherty [Wed, 27 May 2015 04:05:42 +0000 (04:05 +0000)]
am c2e34345: Doc change: update gcm logo in card image.

* commit 'c2e343456e65fde54d1e9f54645030fe11fad585':
  Doc change: update gcm logo in card image.

9 years agoam 3b1c69cf: am ea1f6fb3: Doc change: edits and fixes to data binding guide.
Dirk Dougherty [Wed, 27 May 2015 03:58:37 +0000 (03:58 +0000)]
am 3b1c69cf: am ea1f6fb3: Doc change: edits and fixes to data binding guide.

* commit '3b1c69cfd050c083d4066f483d293875a7b44b90':
  Doc change: edits and fixes to data binding guide.

9 years agoDoc change: update gcm logo in card image.
Dirk Dougherty [Wed, 27 May 2015 03:51:04 +0000 (20:51 -0700)]
Doc change: update gcm logo in card image.

Change-Id: Id55a16aa0fdef874106e2a7ee75c472ad6cca3c6

9 years agoam ea1f6fb3: Doc change: edits and fixes to data binding guide.
Dirk Dougherty [Wed, 27 May 2015 03:45:29 +0000 (03:45 +0000)]
am ea1f6fb3: Doc change: edits and fixes to data binding guide.

* commit 'ea1f6fb385d6f8d19ef18b196b9749dfc74e6cdc':
  Doc change: edits and fixes to data binding guide.

9 years agoDoc change: edits and fixes to data binding guide.
Dirk Dougherty [Wed, 27 May 2015 03:31:12 +0000 (20:31 -0700)]
Doc change: edits and fixes to data binding guide.

Change-Id: Iaef989bd48a99294e2032656653e71ef93313687

9 years agoam 617c2999: am 63c2b34b: am f47dc2cc: Merge "docs: M Preview - fix SDK Setup instruc...
Joe Fernandez [Wed, 27 May 2015 03:31:04 +0000 (03:31 +0000)]
am 617c2999: am 63c2b34b: am f47dc2cc: Merge "docs: M Preview - fix SDK Setup instructions with MNC vs android-MNC" into mnc-preview-docs

* commit '617c2999deeb187e2c3ada28b10e771f73de0554':
  docs: M Preview - fix SDK Setup instructions with MNC vs android-MNC

9 years agoam dadb9cb3: am 1b1fce80: am 7311d2e2: Merge "Docs: "Tombstone" for old NDK page...
David Friedman [Wed, 27 May 2015 03:31:00 +0000 (03:31 +0000)]
am dadb9cb3: am 1b1fce80: am 7311d2e2: Merge "Docs: "Tombstone" for old NDK page, directing visitors to new NDK site." into mnc-preview-docs

* commit 'dadb9cb392417b62cba177c904121950bd7221fd':
  Docs: "Tombstone" for old NDK page, directing visitors to new NDK site.

9 years agoam 64aa569e: Merge "Merge commit \'001701ae\' into manualmergetoday" into mnc-dev
Dirk Dougherty [Wed, 27 May 2015 03:16:23 +0000 (03:16 +0000)]
am 64aa569e: Merge "Merge commit \'001701ae\' into manualmergetoday" into mnc-dev

* commit '64aa569ec87430c764745f037ef1070b811fc348':
  Doc change: move data binding library to tools tab.

9 years agoam 62267e0f: Merge "don\'t report missing launch intent as failure" into mnc-dev
Guang Zhu [Wed, 27 May 2015 03:16:19 +0000 (03:16 +0000)]
am 62267e0f: Merge "don\'t report missing launch intent as failure" into mnc-dev

* commit '62267e0f9e11935ff264e4b5c7dda80e35073d69':
  don't report missing launch intent as failure

9 years agoam 63c2b34b: am f47dc2cc: Merge "docs: M Preview - fix SDK Setup instructions with...
Joe Fernandez [Wed, 27 May 2015 03:15:16 +0000 (03:15 +0000)]
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

9 years agoam 1b1fce80: am 7311d2e2: Merge "Docs: "Tombstone" for old NDK page, directing visito...
David Friedman [Wed, 27 May 2015 03:15:10 +0000 (03:15 +0000)]
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.

9 years agoMerge "Merge commit '001701ae' into manualmergetoday" into mnc-dev
Dirk Dougherty [Wed, 27 May 2015 03:12:17 +0000 (03:12 +0000)]
Merge "Merge commit '001701ae' into manualmergetoday" into mnc-dev

9 years agoMerge commit '001701ae' into manualmergetoday
Dirk Dougherty [Wed, 27 May 2015 03:10:17 +0000 (20:10 -0700)]
Merge commit '001701ae' into manualmergetoday

Change-Id: I78845c61426efe8a0607bbf958e49852a9b62b75

9 years agoMerge "don't report missing launch intent as failure" into mnc-dev
Guang Zhu [Wed, 27 May 2015 03:08:29 +0000 (03:08 +0000)]
Merge "don't report missing launch intent as failure" into mnc-dev

9 years ago[LockSettings] migrate password attempt throttling to hardware
Andres Morales [Fri, 15 May 2015 05:42:26 +0000 (22:42 -0700)]
[LockSettings] migrate password attempt throttling to hardware

leverage root protected, cryptographically secured hardware
if available

Bug: 21118563
Change-Id: Ifa804c5a0728bfd14466eb2a84051bace6d33d57

9 years agoam 80ce4ad6: Merge "Clear binder id after a permissions check before killing a UID...
Svetoslav [Wed, 27 May 2015 01:29:44 +0000 (01:29 +0000)]
am 80ce4ad6: Merge "Clear binder id after a permissions check before killing a UID." into mnc-dev

* commit '80ce4ad644af507b20eeac3d2ecf937ef4abd2de':
  Clear binder id after a permissions check before killing a UID.

9 years agoam f47dc2cc: Merge "docs: M Preview - fix SDK Setup instructions with MNC vs android...
Joe Fernandez [Wed, 27 May 2015 01:28:01 +0000 (01:28 +0000)]
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

9 years agoam 7311d2e2: Merge "Docs: "Tombstone" for old NDK page, directing visitors to new...
David Friedman [Wed, 27 May 2015 01:27:57 +0000 (01:27 +0000)]
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.

9 years agoam 493ff3cb: Doc change: move data binding library to tools tab.
Dirk Dougherty [Wed, 27 May 2015 01:27:52 +0000 (01:27 +0000)]
am 493ff3cb: Doc change: move data binding library to tools tab.

* commit '493ff3cb8f0c6f7729763f7d4a8571c0955d6f4b':
  Doc change: move data binding library to tools tab.

9 years agodon't report missing launch intent as failure
Guang Zhu [Tue, 26 May 2015 20:54:34 +0000 (13:54 -0700)]
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

9 years agoFix typo in Javadocs of KeyGenParameterSpec.
Alex Klyubin [Wed, 27 May 2015 01:10:57 +0000 (18:10 -0700)]
Fix typo in Javadocs of KeyGenParameterSpec.

Bug: 18088752
Change-Id: I76daca80a8066ab55a0104ae113fd2c3a7993af3

9 years agoMerge "docs: M Preview - fix SDK Setup instructions with MNC vs android-MNC" into...
Joe Fernandez [Wed, 27 May 2015 00:03:09 +0000 (00:03 +0000)]
Merge "docs: M Preview - fix SDK Setup instructions with MNC vs android-MNC" into mnc-preview-docs

9 years agoMerge "Docs: "Tombstone" for old NDK page, directing visitors to new NDK site." into...
David Friedman [Tue, 26 May 2015 23:58:57 +0000 (23:58 +0000)]
Merge "Docs: "Tombstone" for old NDK page, directing visitors to new NDK site." into mnc-preview-docs

9 years agoDoc change: move data binding library to tools tab.
Dirk Dougherty [Tue, 26 May 2015 23:52:23 +0000 (16:52 -0700)]
Doc change: move data binding library to tools tab.

Change-Id: I74817864dc6fe390cb52ec2ea52ee1ea3a46c830

9 years agoDocs: "Tombstone" for old NDK page, directing visitors to new NDK site.
David Friedman [Sat, 23 May 2015 07:29:49 +0000 (00:29 -0700)]
Docs: "Tombstone" for old NDK page, directing visitors to new NDK site.

Change-Id: I520bfb5157b2ffed5baa182df7c6305bf8835360

9 years agoMerge "Clear binder id after a permissions check before killing a UID." into mnc-dev
Svetoslav [Tue, 26 May 2015 22:49:10 +0000 (22:49 +0000)]
Merge "Clear binder id after a permissions check before killing a UID." into mnc-dev

9 years agoClear binder id after a permissions check before killing a UID.
Svetoslav [Tue, 26 May 2015 21:46:22 +0000 (14:46 -0700)]
Clear binder id after a permissions check before killing a UID.

bug:21035702

Change-Id: I2798d28780421720d85c5b49fa28897aa6c76d97

9 years agoam bcbe9ba0: Merge "Include Shapes in LayoutLib." into mnc-dev
Deepanshu Gupta [Tue, 26 May 2015 22:47:16 +0000 (22:47 +0000)]
am bcbe9ba0: Merge "Include Shapes in LayoutLib." into mnc-dev

* commit 'bcbe9ba0f939803dfa9b48519e113dc1c32268dc':
  Include Shapes in LayoutLib.

9 years agoam a268ae5f: Merge "LayoutLib: Support getting resource arrays." into mnc-dev
Deepanshu Gupta [Tue, 26 May 2015 22:47:12 +0000 (22:47 +0000)]
am a268ae5f: Merge "LayoutLib: Support getting resource arrays." into mnc-dev

* commit 'a268ae5f51b8b4697aeb337a7d0700ed6e281f66':
  LayoutLib: Support getting resource arrays.

9 years agoam c801e915: Merge "LayoutLib: Change nullity annotations." into mnc-dev
Deepanshu Gupta [Tue, 26 May 2015 22:47:07 +0000 (22:47 +0000)]
am c801e915: Merge "LayoutLib: Change nullity annotations." into mnc-dev

* commit 'c801e91528705145bd403333e69ee7c01eb63d35':
  LayoutLib: Change nullity annotations.

9 years agoMerge "Include Shapes in LayoutLib." into mnc-dev
Deepanshu Gupta [Tue, 26 May 2015 22:37:26 +0000 (22:37 +0000)]
Merge "Include Shapes in LayoutLib." into mnc-dev

9 years agoMerge "LayoutLib: Support getting resource arrays." into mnc-dev
Deepanshu Gupta [Tue, 26 May 2015 22:37:09 +0000 (22:37 +0000)]
Merge "LayoutLib: Support getting resource arrays." into mnc-dev

9 years agoMerge "LayoutLib: Change nullity annotations." into mnc-dev
Deepanshu Gupta [Tue, 26 May 2015 22:36:28 +0000 (22:36 +0000)]
Merge "LayoutLib: Change nullity annotations." into mnc-dev

9 years agoam 9123e666: Merge "Update cached child enabled state before selector state" into...
Alan Viverette [Tue, 26 May 2015 22:35:42 +0000 (22:35 +0000)]
am 9123e666: Merge "Update cached child enabled state before selector state" into mnc-dev

* commit '9123e666bb1a54b466c678400c344c1bb3a266f9':
  Update cached child enabled state before selector state

9 years agoam 2232addd: Offset accessibility focus rect for view root\'s scrollY
Alan Viverette [Tue, 26 May 2015 22:35:38 +0000 (22:35 +0000)]
am 2232addd: Offset accessibility focus rect for view root\'s scrollY

* commit '2232adddc56bb8764a95bbde0c05e0f02f6a1db5':
  Offset accessibility focus rect for view root's scrollY

9 years agoMerge "Update cached child enabled state before selector state" into mnc-dev
Alan Viverette [Tue, 26 May 2015 22:27:30 +0000 (22:27 +0000)]
Merge "Update cached child enabled state before selector state" into mnc-dev

9 years agoOffset accessibility focus rect for view root's scrollY
Alan Viverette [Tue, 26 May 2015 22:24:18 +0000 (15:24 -0700)]
Offset accessibility focus rect for view root's scrollY

Previously we were only partially transforming the focus rect into
window coordinates, so it was offset when the window was panned (for
example, when the IME was showing).

Bug: 20113389
Change-Id: I41f5ed20cb1404232b7042d37ca2fc725f9ee476

9 years agoam 9b232f56: am e7258a6b: am c85bf859: Doc change: Updates to preview program overvie...
Dirk Dougherty [Tue, 26 May 2015 22:20:53 +0000 (22:20 +0000)]
am 9b232f56: am e7258a6b: am c85bf859: Doc change: Updates to preview program overview and tags.

* commit '9b232f56ff58f161b573fc08433375c3e5c4c0cf':
  Doc change: Updates to preview program overview and tags.

9 years agoam 2d091225: Merge "Gracefully handle races with package uninstall" into mnc-dev
Christopher Tate [Tue, 26 May 2015 22:20:49 +0000 (22:20 +0000)]
am 2d091225: Merge "Gracefully handle races with package uninstall" into mnc-dev

* commit '2d09122563360b377a1e66ebbdf084af9cb881e8':
  Gracefully handle races with package uninstall

9 years agoam 7c7d71b1: Merge "Fix position snapping for drawBitmap(rect, rect)" into mnc-dev
Chris Craik [Tue, 26 May 2015 22:20:43 +0000 (22:20 +0000)]
am 7c7d71b1: Merge "Fix position snapping for drawBitmap(rect, rect)" into mnc-dev

* commit '7c7d71b184df5e7081d8b32ca38d2959d1385784':
  Fix position snapping for drawBitmap(rect, rect)

9 years agoam e7258a6b: am c85bf859: Doc change: Updates to preview program overview and tags.
Dirk Dougherty [Tue, 26 May 2015 22:14:44 +0000 (22:14 +0000)]
am e7258a6b: am c85bf859: Doc change: Updates to preview program overview and tags.

* commit 'e7258a6be3e6dab45bab79c7656c3c6106d36070':
  Doc change: Updates to preview program overview and tags.

9 years agoMerge "Gracefully handle races with package uninstall" into mnc-dev
Christopher Tate [Tue, 26 May 2015 22:10:51 +0000 (22:10 +0000)]
Merge "Gracefully handle races with package uninstall" into mnc-dev

9 years agoMerge "Fix position snapping for drawBitmap(rect, rect)" into mnc-dev
Chris Craik [Tue, 26 May 2015 22:08:56 +0000 (22:08 +0000)]
Merge "Fix position snapping for drawBitmap(rect, rect)" into mnc-dev

9 years agoam 60750d25: am d4557a5c: am f4f455cc: am b1cc82b7: Merge "docs: Replace Umano with...
Luan Nguyen [Tue, 26 May 2015 22:06:38 +0000 (22:06 +0000)]
am 60750d25: am d4557a5c: am f4f455cc: am b1cc82b7: Merge "docs: Replace Umano with WhatsApp icon" into lmp-mr1-ub-docs

* commit '60750d2543a2e007a8b293a78ac0f19e66daf3c6':
  docs: Replace Umano with WhatsApp icon

9 years agoam 3452d2d0: Merge "Honor password visible setting in CryptKeeper" into mnc-dev
Paul Lawrence [Tue, 26 May 2015 22:06:34 +0000 (22:06 +0000)]
am 3452d2d0: Merge "Honor password visible setting in CryptKeeper" into mnc-dev

* commit '3452d2d0dbffc74a87751b39da9fa40d88d5c91f':
  Honor password visible setting in CryptKeeper

9 years agoFix position snapping for drawBitmap(rect, rect)
Chris Craik [Tue, 26 May 2015 21:25:02 +0000 (14:25 -0700)]
Fix position snapping for drawBitmap(rect, rect)

bug:20669049
Change-Id: Ied5f1d7e681409b6b7f6f582ed344b479df4c6d7