OSDN Git Service
Marco Nelissen [Wed, 27 May 2015 23:05:14 +0000 (23:05 +0000)]
Merge "Handle unknown duration in playMediaSamples test" into mnc-dev
Jorim Jaggi [Wed, 27 May 2015 22:57:13 +0000 (22:57 +0000)]
Merge "Fix status bar window IME flags & layout" into mnc-dev
Trevor Johns [Wed, 27 May 2015 22:56:08 +0000 (22:56 +0000)]
am
29649e27: am
6ea840d1: am
4cbe359a: Add \'System\' group to DAC sample browser
* commit '
29649e27a3c73d4470dc41e4c9614da55fac1c54':
Add 'System' group to DAC sample browser
Trevor Johns [Wed, 27 May 2015 22:41:19 +0000 (22:41 +0000)]
am
6ea840d1: am
4cbe359a: Add \'System\' group to DAC sample browser
* commit '
6ea840d15e66a5d2ba6e70f9e07ff59adb4d6d2a':
Add 'System' group to DAC sample browser
Joe Fernandez [Wed, 27 May 2015 22:31:28 +0000 (22:31 +0000)]
am
6793b7b0: am
91a90991: Merge "docs: M Preview - System Image Downloads" into mnc-preview-docs
* commit '
6793b7b0c6afdb2c234c224aeae205cc594338bb':
docs: M Preview - System Image Downloads
David Friedman [Wed, 27 May 2015 22:31:23 +0000 (22:31 +0000)]
am
2e4ebfbd: am
f7883698: Merge "Docs: Samples-tab material for NDK minisite." into mnc-preview-docs
* commit '
2e4ebfbd70dea6f3f71f4776c08557683bce671c':
Docs: Samples-tab material for NDK minisite.
Trevor Johns [Wed, 27 May 2015 22:22:53 +0000 (22:22 +0000)]
am
4cbe359a: Add \'System\' group to DAC sample browser
* commit '
4cbe359abe26d749b1dbc9cf489a825af0cad005':
Add 'System' group to DAC sample browser
Christopher Tate [Wed, 27 May 2015 22:17:40 +0000 (22:17 +0000)]
Merge "Don't erase backup metadata when an app is uninstalled" into mnc-dev
Joe Fernandez [Wed, 27 May 2015 22:14:20 +0000 (22:14 +0000)]
am
91a90991: Merge "docs: M Preview - System Image Downloads" into mnc-preview-docs
* commit '
91a90991248b60b07674c321aca19f23f1f2b51e':
docs: M Preview - System Image Downloads
David Friedman [Wed, 27 May 2015 22:14:05 +0000 (22:14 +0000)]
am
f7883698: Merge "Docs: Samples-tab material for NDK minisite." into mnc-preview-docs
* commit '
f7883698e19eafd678dfdb2af5a470b30f5153c8':
Docs: Samples-tab material for NDK minisite.
Joe Fernandez [Wed, 27 May 2015 22:10:38 +0000 (22:10 +0000)]
Merge "docs: M Preview - System Image Downloads" into mnc-preview-docs
Christopher Tate [Tue, 26 May 2015 19:57:56 +0000 (12:57 -0700)]
Don't erase backup metadata when an app is uninstalled
We still retain the data in the backup, in order to support the flow
in which a user has the app and its data is stored; then the app
is uninstalled; then later the app is reinstalled. We depend on
having correct metadata for the data in the datastore in order to
evaluate its validity for restore-at-install, so we mustn't
forget that metadata just because the app is not currently
installed.
We also now permit the sentinel pseudopackage name "@pm@" as an
argument to dataChanged(), indicating specifically that the metadata
should be scheduled for backup without having to be piggybacked on
another app's requested backup pass. That lets us now make sure to
schedule a backup pass for metadata-update in response to app
install activity.
Finally, fix a "min instead of max" bug in full backup scheduling
that was causing the OS to ignore the transport's inter-package
quiet time requirement when multiple packages were overdue for
backup.
Bug
21471973
Change-Id: I1dbc260edb91b8deadd2744e273dfa9578b9ef2a
Joe Fernandez [Wed, 27 May 2015 22:04:22 +0000 (15:04 -0700)]
docs: M Preview - System Image Downloads
Change-Id: I0f88dea54b47512c7f4eb76b72c5bcba0bca41ed
David Friedman [Wed, 27 May 2015 22:00:55 +0000 (22:00 +0000)]
Merge "Docs: Samples-tab material for NDK minisite." into mnc-preview-docs
David Friedman [Wed, 27 May 2015 17:35:55 +0000 (10:35 -0700)]
Docs: Samples-tab material for NDK minisite.
Change-Id: I0ae1bf83feb2a8cab97e3911f7069b19ae818ffa
Trevor Johns [Wed, 27 May 2015 21:50:51 +0000 (14:50 -0700)]
Add 'System' group to DAC sample browser
Bug:
19708211
Change-Id: I55ad484647b859fce6c59f0e147523a8a709a527
Svetoslav [Wed, 27 May 2015 21:41:29 +0000 (21:41 +0000)]
Merge "Allow priv apps to get local mac address" into mnc-dev
Svetoslav [Wed, 27 May 2015 21:39:21 +0000 (14:39 -0700)]
Allow priv apps to get local mac address
Change-Id: I550847cedd5a407c9424778e483b525d4b97e46d
Alan Viverette [Wed, 27 May 2015 21:30:05 +0000 (21:30 +0000)]
Merge "Move ApplicationInfo hardware acceleration to public flags" into mnc-dev
Alan Viverette [Wed, 27 May 2015 21:29:20 +0000 (14:29 -0700)]
Move ApplicationInfo hardware acceleration to public flags
Bug:
21342038
Change-Id: I5af826f3f2921eef24725c909304243c67f3da78
Winson Chung [Wed, 27 May 2015 21:27:20 +0000 (21:27 +0000)]
Merge "Adding NPE check when the system has no tasks." into mnc-dev
Winson Chung [Wed, 27 May 2015 21:26:47 +0000 (21:26 +0000)]
Merge "Fixing issue with screenshot icon being stretched." into mnc-dev
Winson Chung [Wed, 27 May 2015 19:41:29 +0000 (12:41 -0700)]
Fixing issue with screenshot icon being stretched.
Bug:
17491725
Change-Id: Iea36ed204dc9431fe1d80be5224a1fcbf6ff1c40
Ben Kwa [Wed, 27 May 2015 21:18:23 +0000 (21:18 +0000)]
Merge "Ensure that the copy notification is always cancelable." into mnc-dev
Chong Zhang [Wed, 27 May 2015 21:17:11 +0000 (21:17 +0000)]
Merge "MediaCodec: unhide mime type for EAC3" into mnc-dev
Chong Zhang [Wed, 27 May 2015 21:07:29 +0000 (14:07 -0700)]
MediaCodec: unhide mime type for EAC3
bug:
18723951
Change-Id: I8c77be6ede428e92b089b19b2bd627992466a591
Chris Wren [Wed, 27 May 2015 21:05:07 +0000 (21:05 +0000)]
Merge "add event timers to all notification logs." into mnc-dev
Leon Scroggins III [Wed, 27 May 2015 20:51:15 +0000 (20:51 +0000)]
am
e15fa565: (-s ours) am
650f688c: 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 '
e15fa5654a902b79fa1ef5075f147e60ad90ae31':
Check that the parcel contained the expected amount of region data. DO NOT MERGE
Leon Scroggins III [Wed, 27 May 2015 20:51:11 +0000 (20:51 +0000)]
am
ffe36bfb: (-s ours) am
1b4eed56: 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 '
ffe36bfbec4fc5fca89dca713c385c0fa6ee75c0':
Check that the parcel contained the expected amount of region data. DO NOT MERGE
Alan Viverette [Wed, 27 May 2015 20:33:53 +0000 (20:33 +0000)]
Merge "API Review: Drawable" into mnc-dev
Tenghui Zhu [Wed, 27 May 2015 20:33:47 +0000 (20:33 +0000)]
Merge "AnimatedVectorDrawable Attr proof of concept" into mnc-dev
Rich Slogar [Wed, 27 May 2015 20:32:30 +0000 (20:32 +0000)]
am
986cc34c: am
4575cadc: docs: supportlib icon fix
* commit '
986cc34c64728d38145c0e981e1f0dd86a83b96b':
docs: supportlib icon fix
Luan Nguyen [Wed, 27 May 2015 20:32:24 +0000 (20:32 +0000)]
am
60877970: am
5904628c: docs: Remove Voice Camera sample.
* commit '
608779702f0fccd5fe06cbc000a9a4073bef97a5':
docs: Remove Voice Camera sample.
Luan Nguyen [Wed, 27 May 2015 20:32:20 +0000 (20:32 +0000)]
am
f42c6dfb: am
5380cb6a: Merge "docs: Remove \'s\' from Confirm Credential sample." into mnc-preview-docs
* commit '
f42c6dfbc3ccf0c11c33a4054725f95725764699':
docs: Remove 's' from Confirm Credential sample.
Joe Fernandez [Wed, 27 May 2015 20:32:15 +0000 (20:32 +0000)]
am
3d3414e4: am
47badfeb: Merge "docs: M Preview - App links fix update" into mnc-preview-docs
* commit '
3d3414e4dc63b4d1c494368becdc59696336bae6':
docs: M Preview - App links fix update
Luan Nguyen [Wed, 27 May 2015 20:32:09 +0000 (20:32 +0000)]
am
35c53c54: am
27ce77ac: Merge "docs: Update instructions to download samples in Android Studio." into mnc-preview-docs
* commit '
35c53c5453def1c97493b84298305e20688dccdc':
docs: Update instructions to download samples in Android Studio.
Leon Scroggins III [Wed, 27 May 2015 20:31:41 +0000 (20:31 +0000)]
am
650f688c: 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 '
650f688c17f1439ac0e555668e4c454c3a3d273a':
Check that the parcel contained the expected amount of region data. DO NOT MERGE
Leon Scroggins III [Wed, 27 May 2015 20:31:37 +0000 (20:31 +0000)]
am
1b4eed56: 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 '
1b4eed5659a4ac6e4a9f276c7f63da7dda4fa3b7':
Check that the parcel contained the expected amount of region data. DO NOT MERGE
Alan Viverette [Wed, 27 May 2015 20:26:41 +0000 (13:26 -0700)]
API Review: Drawable
Renames boolean getters to isZzz(), callback from onChange to onChanged.
Bug:
21342040
Change-Id: I9700d645453354b608fd97a832359211d828b52f
Andrew Solovay [Wed, 27 May 2015 20:22:20 +0000 (20:22 +0000)]
am
30788ec8: am
f0560097: Merge "docs: Fixed targetSdkVersion in Auto Backup code snippets" into mnc-preview-docs
* commit '
30788ec81cec52eaf201f33eee9942016c18a8a9':
docs: Fixed targetSdkVersion in Auto Backup code snippets
Rich Slogar [Wed, 27 May 2015 20:22:15 +0000 (20:22 +0000)]
am
36462020: am
aa3d35e6: Merge "docs: support library 22.2 duplicate link removal" into mnc-preview-docs
* commit '
36462020d1d2cc6199115335bbf33c18829f64a8':
docs: support library 22.2 duplicate link removal
Andrew Solovay [Wed, 27 May 2015 20:22:10 +0000 (20:22 +0000)]
am
b709b0e8: am
b7227c2b: Merge "docs: Fixing typo on Auto Backup for Apps page." into mnc-preview-docs
* commit '
b709b0e897c8feea38a211b6254c2dde33e319f6':
docs: Fixing typo on Auto Backup for Apps page.
David Friedman [Wed, 27 May 2015 20:22:04 +0000 (20:22 +0000)]
am
9b57a20a: am
be4fc248: Merge "Docs: Final, master CL for NDK-docs-to-DAC for IO: "Guides," "Downloads" tabs." into mnc-preview-docs
* commit '
9b57a20a555b32d5c1e8d11b7f580a7b8115dd79':
Docs: Final, master CL for NDK-docs-to-DAC for IO: "Guides," "Downloads" tabs.
Quddus Chong [Wed, 27 May 2015 20:21:59 +0000 (20:21 +0000)]
am
c33eba1a: am
8525b8a8: (-s ours) Merge "docs: Remove Google Play Services pages under Develop > Google Services. bug:
21407467" into mnc-preview-docs
* commit '
c33eba1aa53c9a591fd2c881c8008dbbef3ccf46':
docs: Remove Google Play Services pages under Develop > Google Services. bug:
21407467
Rich Slogar [Wed, 27 May 2015 20:21:30 +0000 (20:21 +0000)]
am
4575cadc: docs: supportlib icon fix
* commit '
4575cadc54ed2c574a6198b7247a774c5f8297cb':
docs: supportlib icon fix
Luan Nguyen [Wed, 27 May 2015 20:21:25 +0000 (20:21 +0000)]
am
5904628c: docs: Remove Voice Camera sample.
* commit '
5904628c89a1757be9fde4983d4e7f8cff28eb7c':
docs: Remove Voice Camera sample.
Luan Nguyen [Wed, 27 May 2015 20:21:20 +0000 (20:21 +0000)]
am
5380cb6a: Merge "docs: Remove \'s\' from Confirm Credential sample." into mnc-preview-docs
* commit '
5380cb6a8880fc6622bd669bc06321c20e1320d9':
docs: Remove 's' from Confirm Credential sample.
Joe Fernandez [Wed, 27 May 2015 20:21:15 +0000 (20:21 +0000)]
am
47badfeb: Merge "docs: M Preview - App links fix update" into mnc-preview-docs
* commit '
47badfebebec011fb6df48360c647c6ec15800ff':
docs: M Preview - App links fix update
Luan Nguyen [Wed, 27 May 2015 20:21:11 +0000 (20:21 +0000)]
am
27ce77ac: Merge "docs: Update instructions to download samples in Android Studio." into mnc-preview-docs
* commit '
27ce77acfda17b04d14e70d5f30c160f72ad8733':
docs: Update instructions to download samples in Android Studio.
Leon Scroggins III [Wed, 27 May 2015 20:20:42 +0000 (20:20 +0000)]
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
Leon Scroggins III [Wed, 27 May 2015 20:20:38 +0000 (20:20 +0000)]
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
Rich Slogar [Wed, 27 May 2015 20:03:14 +0000 (13:03 -0700)]
docs: supportlib icon fix
Change-Id: I423271109e479a8bacc8edb44801dcb5c05ef634
Alan Viverette [Wed, 27 May 2015 19:59:11 +0000 (19:59 +0000)]
Merge "Remove unused asset, prune large rarely-used Holo assets from preload" into mnc-dev
Alan Viverette [Wed, 27 May 2015 19:55:49 +0000 (12:55 -0700)]
Remove unused asset, prune large rarely-used Holo assets from preload
Bug:
21352447
Change-Id: I4ad6bc99edf5af0a665827702457925339204f97
Winson Chung [Wed, 27 May 2015 19:45:20 +0000 (12:45 -0700)]
Adding NPE check when the system has no tasks.
Bug:
20640135
Change-Id: Ifb62d18dbf2125bc33325b7c2f2a44da51309325
Marco Nelissen [Wed, 27 May 2015 19:33:03 +0000 (12:33 -0700)]
Handle unknown duration in playMediaSamples test
Bug:
21391417
Change-Id: I85d8f5921e8423da078acfe3aff34a6fcef69e78
Alan Viverette [Wed, 27 May 2015 19:26:25 +0000 (19:26 +0000)]
Merge "Use DeviceDefault (dark) theme for PrintActivity" 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
Chris Craik [Wed, 27 May 2015 19:22:42 +0000 (19:22 +0000)]
Merge "Fix GL texture binding for TextureViews" into mnc-dev
Chris Wren [Wed, 27 May 2015 19:21:00 +0000 (15:21 -0400)]
add event timers to all notification logs.
previously, some logs had only some times, and not others.
Bug:
21394955
Change-Id: I0d7af163be23f5a989c35aba6e6f6879672543fc
Alan Viverette [Wed, 27 May 2015 19:17:26 +0000 (12:17 -0700)]
Use DeviceDefault (dark) theme for PrintActivity
Bug:
21433656
Change-Id: If90ba72fb5862f0eb583c8e64642920c49c5fea6
Luan Nguyen [Wed, 27 May 2015 18:58:52 +0000 (11:58 -0700)]
docs: Remove Voice Camera sample.
Change-Id: I65ac20c33be9820519c0eb0e931272a0ef9bb34f
Andrew Solovay [Wed, 27 May 2015 18:54:52 +0000 (18:54 +0000)]
am
f0560097: Merge "docs: Fixed targetSdkVersion in Auto Backup code snippets" into mnc-preview-docs
* commit '
f0560097eef030d3bf65132c974dbc2f6b1cb681':
docs: Fixed targetSdkVersion in Auto Backup code snippets
Rich Slogar [Wed, 27 May 2015 18:54:48 +0000 (18:54 +0000)]
am
aa3d35e6: Merge "docs: support library 22.2 duplicate link removal" into mnc-preview-docs
* commit '
aa3d35e677e027bf9a8a17c59b6507e588a1b9cb':
docs: support library 22.2 duplicate link removal
Andrew Solovay [Wed, 27 May 2015 18:54:42 +0000 (18:54 +0000)]
am
b7227c2b: Merge "docs: Fixing typo on Auto Backup for Apps page." into mnc-preview-docs
* commit '
b7227c2bf9f1893c5d9778a8344b1bfe6394c4d3':
docs: Fixing typo on Auto Backup for Apps page.
David Friedman [Wed, 27 May 2015 18:54:37 +0000 (18:54 +0000)]
am
be4fc248: Merge "Docs: Final, master CL for NDK-docs-to-DAC for IO: "Guides," "Downloads" tabs." into mnc-preview-docs
* commit '
be4fc248b72e27dad6f677910566226c7dd9d670':
Docs: Final, master CL for NDK-docs-to-DAC for IO: "Guides," "Downloads" tabs.
Quddus Chong [Wed, 27 May 2015 18:54:31 +0000 (18:54 +0000)]
am
8525b8a8: (-s ours) Merge "docs: Remove Google Play Services pages under Develop > Google Services. bug:
21407467" into mnc-preview-docs
* commit '
8525b8a8b54e2f97839cb80eee79404ab196c2db':
docs: Remove Google Play Services pages under Develop > Google Services. bug:
21407467
Luan Nguyen [Wed, 27 May 2015 18:52:32 +0000 (18:52 +0000)]
Merge "docs: Remove 's' from Confirm Credential sample." into mnc-preview-docs
Luan Nguyen [Wed, 27 May 2015 18:51:14 +0000 (11:51 -0700)]
docs: Remove 's' from Confirm Credential sample.
Change-Id: I4b33fec58014c54594210e0f5f4e759393adc618
Joe Fernandez [Wed, 27 May 2015 18:51:07 +0000 (18:51 +0000)]
Merge "docs: M Preview - App links fix update" into mnc-preview-docs
Alex Klyubin [Wed, 27 May 2015 18:46:55 +0000 (18:46 +0000)]
Merge "Fix typo in Javadocs of KeyGenParameterSpec." 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
Jorim Jaggi [Thu, 21 May 2015 01:04:16 +0000 (18:04 -0700)]
Fix status bar window IME flags & layout
When bouncer was showing, but keyguard was occluded, staus bar
window couldn't receive input, and thus the IME window was placed
below the status bar window. In addition to that, fix the layout when
IME is showing up on the bouncer screen.
Bug:
19969474
Change-Id: I38d21647801b57608d49c3f525d4840e6ba58296
Joe Fernandez [Wed, 27 May 2015 18:28:36 +0000 (11:28 -0700)]
docs: M Preview - App links fix update
- final comments
- naming change to "App Links"
Change-Id: I2c8f105e0b75f95ca2e9d6bb86fd85d21dcd3326
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
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
Luan Nguyen [Wed, 27 May 2015 18:22:38 +0000 (18:22 +0000)]
Merge "docs: Update instructions to download samples in Android Studio." into mnc-preview-docs
Luan Nguyen [Wed, 27 May 2015 15:51:32 +0000 (08:51 -0700)]
docs: Update instructions to download samples in Android Studio.
bug:
21425873
Change-Id: I0e5710c08f7fbe5f92ca16b366ea14a1b05d491a
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
Alan Viverette [Wed, 27 May 2015 18:00:14 +0000 (18:00 +0000)]
Merge "Avoid strict mode violation during saveAttributeData" into mnc-dev
Leon Scroggins III [Wed, 27 May 2015 17:52:58 +0000 (17:52 +0000)]
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
Leon Scroggins III [Wed, 27 May 2015 17:52:51 +0000 (17:52 +0000)]
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
Cedric Ho [Wed, 27 May 2015 17:46:40 +0000 (17:46 +0000)]
Merge "Add getCallingUid() to RecognitionService.Callback." into mnc-dev
Andrew Solovay [Wed, 27 May 2015 17:41:05 +0000 (17:41 +0000)]
Merge "docs: Fixed targetSdkVersion in Auto Backup code snippets" into mnc-preview-docs
John Reck [Wed, 27 May 2015 17:39:17 +0000 (17:39 +0000)]
Merge "Enable swapBuffersWithDamage by default" into mnc-dev
Rich Slogar [Wed, 27 May 2015 17:38:48 +0000 (17:38 +0000)]
Merge "docs: support library 22.2 duplicate link removal" into mnc-preview-docs
Andrew Solovay [Wed, 27 May 2015 02:57:52 +0000 (19:57 -0700)]
docs: Fixed targetSdkVersion in Auto Backup code snippets
Changed targetSdkVerion from "android-MNC" to "MNC". Also--per
preview/setup-sdk.html -- changed the minSdkVersion to "MNC" in
both places (if people are building apps for the preview release,
the minimum SDK version has to be MNC to keep the app from getting
installed onto devices running production Android).
See first comment for doc stage location.
bug:
21443485
Change-Id: I4cc5f16d53cd795b2db156c99db7c46f14d0ce65
Leon Scroggins III [Wed, 27 May 2015 17:34:55 +0000 (17:34 +0000)]
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
Leon Scroggins III [Wed, 27 May 2015 17:34:51 +0000 (17:34 +0000)]
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
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
John Reck [Wed, 27 May 2015 17:26:10 +0000 (10:26 -0700)]
Enable swapBuffersWithDamage by default
Bug:
20761426
Change-Id: I520e60ca4f182dea590bc86eebd522e1db7a018a
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
Andrew Solovay [Wed, 27 May 2015 17:23:56 +0000 (17:23 +0000)]
Merge "docs: Fixing typo on Auto Backup for Apps page." into mnc-preview-docs
Leon Scroggins III [Wed, 27 May 2015 17:18:54 +0000 (17:18 +0000)]
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
Leon Scroggins III [Wed, 27 May 2015 17:18:47 +0000 (17:18 +0000)]
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
David Friedman [Wed, 27 May 2015 17:16:32 +0000 (17:16 +0000)]
Merge "Docs: Final, master CL for NDK-docs-to-DAC for IO: "Guides," "Downloads" tabs." into mnc-preview-docs
Cedric Ho [Wed, 27 May 2015 16:51:19 +0000 (09:51 -0700)]
Add getCallingUid() to RecognitionService.Callback.
Change-Id: I596471625eee24ec93d08650c33461d35ad0aa07
Geoff Mendal [Wed, 27 May 2015 16:41:15 +0000 (16:41 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
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
Ben Kwa [Wed, 27 May 2015 16:18:53 +0000 (09:18 -0700)]
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
OSDN Git Service
