OSDN Git Service
Sungsoo Lim [Thu, 13 Oct 2016 22:22:36 +0000 (22:22 +0000)]
Merge "ExifInterface: Provide backward compatibility" into nyc-dev am:
e29077105e am:
9dd9c5a856 am:
5554e0ac16
am:
19347eba88
Change-Id: Ie0bcf9d17172d804bf3c6912acceb933284ac99c
Sungsoo [Thu, 13 Oct 2016 22:21:47 +0000 (22:21 +0000)]
ExifInterface: Provide backward compatibility am:
2dbe166801 am:
bc813cd510 am:
36f64a2f0c
am:
b68d0855c4
Change-Id: I40df333d3b19911be333e5c466dfe01a3db4bd70
Sungsoo Lim [Thu, 13 Oct 2016 22:13:01 +0000 (22:13 +0000)]
Merge "ExifInterface: Provide backward compatibility" into nyc-dev am:
e29077105e am:
9dd9c5a856
am:
5554e0ac16
Change-Id: Ie6b60e245d20b586ee4aeb4549d603c85d6457ee
Sungsoo [Thu, 13 Oct 2016 22:11:58 +0000 (22:11 +0000)]
ExifInterface: Provide backward compatibility am:
2dbe166801 am:
bc813cd510
am:
36f64a2f0c
Change-Id: Ibc82a2ddd80dff7d98880db0a179fbb1540ac6f8
Sungsoo Lim [Thu, 13 Oct 2016 22:06:46 +0000 (22:06 +0000)]
Merge "ExifInterface: Provide backward compatibility" into nyc-dev am:
e29077105e
am:
9dd9c5a856
Change-Id: I293992f615763762ee6d403a5548d873e4891271
Sungsoo [Thu, 13 Oct 2016 22:06:01 +0000 (22:06 +0000)]
ExifInterface: Provide backward compatibility am:
2dbe166801
am:
bc813cd510
Change-Id: I0aa6d33baeec8dd991561d964bfce16915c0553d
Sungsoo Lim [Thu, 13 Oct 2016 21:57:26 +0000 (21:57 +0000)]
Merge "ExifInterface: Provide backward compatibility" into nyc-dev
am:
e29077105e
Change-Id: I1591f2c41214c14bb85ea90d59e94a44dafe8a77
Sungsoo [Thu, 13 Oct 2016 21:57:22 +0000 (21:57 +0000)]
ExifInterface: Provide backward compatibility
am:
2dbe166801
Change-Id: I53f2bfb056d955c6693cb65c9cb9a21859ff7535
Sungsoo Lim [Thu, 13 Oct 2016 21:46:38 +0000 (21:46 +0000)]
Merge "ExifInterface: Provide backward compatibility" into nyc-dev
Christopher Tate [Thu, 13 Oct 2016 21:17:54 +0000 (21:17 +0000)]
Merge "Only full-data back up regular files + directories" into nyc-mr1-dev am:
b3ca7c26e1
am:
82d9562f27
Change-Id: I04da3aeeecb65c557fe0715d7d97d182f07c43f0
Christopher Tate [Thu, 13 Oct 2016 21:17:09 +0000 (21:17 +0000)]
Only full-data back up regular files + directories am:
da2018efeb
am:
0d816b8f69
Change-Id: I3b28c373c58ebebf27b1297e770d2023767e6396
Christopher Tate [Thu, 13 Oct 2016 21:13:03 +0000 (21:13 +0000)]
Merge "Only full-data back up regular files + directories" into nyc-mr1-dev
am:
b3ca7c26e1
Change-Id: I363cf717193316eaa9ad910284bb3140c6684dbc
Christopher Tate [Thu, 13 Oct 2016 21:13:00 +0000 (21:13 +0000)]
Only full-data back up regular files + directories
am:
da2018efeb
Change-Id: I6ecc74ee9613f221e24acca571560bf8190b7073
Greg Plesur [Thu, 13 Oct 2016 21:12:56 +0000 (21:12 +0000)]
Merge "DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should return 'false' for Wear devices after pairing/upgrade." into cw-f-dev
am:
216ee1f0e7
Change-Id: I585c709c3a8648e754779c71497d18a35b321bb7
Greg Plesur [Thu, 13 Oct 2016 21:12:51 +0000 (21:12 +0000)]
DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should return 'false' for Wear devices after pairing/upgrade.
am:
3514404984
Change-Id: I8d24007831ba030af0d84f717802c79172db970f
TreeHugger Robot [Thu, 13 Oct 2016 21:06:56 +0000 (21:06 +0000)]
Merge "Only full-data back up regular files + directories" into nyc-mr1-dev
Greg Plesur [Thu, 13 Oct 2016 21:01:59 +0000 (21:01 +0000)]
Merge "DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should return 'false' for Wear devices after pairing/upgrade." into cw-f-dev
Dianne Hackborn [Thu, 13 Oct 2016 20:41:01 +0000 (20:41 +0000)]
Merge "Fix issue #
32125907: Intent.replaceUnsafeExtras() corrupts original bundle" into nyc-mr1-dev am:
33e56a9e1f
am:
d3ad5ce147
Change-Id: Ic097998a5fdbe47831934baf0f8bdebcfd622007
Dianne Hackborn [Thu, 13 Oct 2016 20:38:04 +0000 (20:38 +0000)]
Fix issue #
32125907: Intent.replaceUnsafeExtras() corrupts original bundle am:
851ec49de7
am:
9774ea3646
Change-Id: I7e27381f7fa4ca8770ca06cdc6c0bdd18a549ae2
Dianne Hackborn [Thu, 13 Oct 2016 20:36:38 +0000 (20:36 +0000)]
Merge "Fix issue #
32125907: Intent.replaceUnsafeExtras() corrupts original bundle" into nyc-mr1-dev
am:
33e56a9e1f
Change-Id: I74c2a5391f8eebf0544447886b14714fbd0202b1
Dianne Hackborn [Thu, 13 Oct 2016 20:31:43 +0000 (20:31 +0000)]
Fix issue #
32125907: Intent.replaceUnsafeExtras() corrupts original bundle
am:
851ec49de7
Change-Id: I8a5f8e28f8e4ca7e8fd20abacc0da1dae4055da7
Dianne Hackborn [Thu, 13 Oct 2016 20:21:23 +0000 (20:21 +0000)]
Merge "Fix issue #
32125907: Intent.replaceUnsafeExtras() corrupts original bundle" into nyc-mr1-dev
Svetoslav Ganov [Thu, 13 Oct 2016 20:20:55 +0000 (20:20 +0000)]
Merge "Allow SetupWizard to do WiFi scans if location off" into nyc-mr1-dev am:
cba436b312
am:
8d3fc0fd8a
Change-Id: I3002282020faf541fc37e1137a3c89d23b99f416
Svetoslav Ganov [Thu, 13 Oct 2016 20:19:45 +0000 (20:19 +0000)]
Allow SetupWizard to do WiFi scans if location off am:
b2457c3704
am:
ff484bbfeb
Change-Id: I7f6cda2da22347375507a0364e976bbb01066ccc
Svetoslav Ganov [Thu, 13 Oct 2016 20:15:19 +0000 (20:15 +0000)]
Merge "Allow SetupWizard to do WiFi scans if location off" into nyc-mr1-dev
am:
cba436b312
Change-Id: Iccde94bb855b3461ddb804b69182c439f9c07e1f
Svetoslav Ganov [Thu, 13 Oct 2016 20:15:16 +0000 (20:15 +0000)]
Allow SetupWizard to do WiFi scans if location off
am:
b2457c3704
Change-Id: I3afe3d8628e8af5806b03b86ea5c866fd454cddd
Svetoslav Ganov [Thu, 13 Oct 2016 20:06:00 +0000 (20:06 +0000)]
Merge "Allow SetupWizard to do WiFi scans if location off" into nyc-mr1-dev
Android Build Merger (Role) [Thu, 13 Oct 2016 19:21:32 +0000 (19:21 +0000)]
Merge "Merge "docs: Removed "Accessibility" page from "Pure Android" design docs" into nyc-dev am:
2acaf0a120 am:
f3d638b1d3" into nyc-mr1-dev-plus-aosp
Kevin Hufnagle [Thu, 13 Oct 2016 19:20:48 +0000 (19:20 +0000)]
Merge "docs: Removed "Accessibility" page from "Pure Android" design docs" into nyc-dev am:
2acaf0a120
am:
f3d638b1d3
Change-Id: I1613de506cb28ae1bb0e24afce1f9262e780332d
Android Build Merger (Role) [Thu, 13 Oct 2016 19:20:29 +0000 (19:20 +0000)]
Merge "docs: Removed "Accessibility" page from "Pure Android" design docs am:
1965375aa5 am:
906703d124" into nyc-mr1-dev-plus-aosp
Kevin Hufnagle [Thu, 13 Oct 2016 19:19:55 +0000 (19:19 +0000)]
docs: Removed "Accessibility" page from "Pure Android" design docs am:
1965375aa5
am:
906703d124
Change-Id: I4bc463517602130e36d6ff126f7387214073f4cc
Christopher Tate [Thu, 13 Oct 2016 19:12:29 +0000 (12:12 -0700)]
Only full-data back up regular files + directories
Ignore every filesystem entity that is not a regular file or directory.
In particular, we now ignore not only symlinks but also sockets, pipes,
et cetera.
Bug
32143362
Change-Id: If51b54df1f7a643af145eb15bf12d389d19f8780
Android Build Merger (Role) [Thu, 13 Oct 2016 19:19:38 +0000 (19:19 +0000)]
Merge "docs: Changed Google Analytics link to https:// am:
374ddfe529 am:
b3fcc389d2" into nyc-mr1-dev-plus-aosp
Andrew Solovay [Thu, 13 Oct 2016 19:18:57 +0000 (19:18 +0000)]
docs: Changed Google Analytics link to https:// am:
374ddfe529
am:
b3fcc389d2
Change-Id: Ib2514a3735156498573e84daaba68fe2dfcd49ce
Android Build Merger (Role) [Thu, 13 Oct 2016 19:18:40 +0000 (19:18 +0000)]
Merge "Merge "docs: Add Android developer written case studies" into nyc-dev am:
d2c5657e9c am:
e28b5e72af" into nyc-mr1-dev-plus-aosp
Joe Fernandez [Thu, 13 Oct 2016 19:18:08 +0000 (19:18 +0000)]
Merge "docs: Add Android developer written case studies" into nyc-dev am:
d2c5657e9c
am:
e28b5e72af
Change-Id: I0f92c59eabacfce3f8b206fcda8ceac143bfc1e4
Android Build Merger (Role) [Thu, 13 Oct 2016 19:17:51 +0000 (19:17 +0000)]
Merge "docs: Add Android developer written case studies am:
cf71b1fdc0 am:
22008c24ed" into nyc-mr1-dev-plus-aosp
George French [Thu, 13 Oct 2016 19:17:22 +0000 (19:17 +0000)]
docs: Add Android developer written case studies am:
cf71b1fdc0
am:
22008c24ed
Change-Id: I12ec64b7e0362728eca32ca61795e65904cc9b74
Android Build Merger (Role) [Thu, 13 Oct 2016 19:17:20 +0000 (19:17 +0000)]
Merge "Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only" into nyc-mr1-dev am:
4bd56fbbee am:
622e97ffaf" into nyc-mr1-dev-plus-aosp
Chris Tate [Thu, 13 Oct 2016 19:16:47 +0000 (19:16 +0000)]
Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only" into nyc-mr1-dev am:
4bd56fbbee
am:
622e97ffaf
Change-Id: I5ebed04800d3acf758787067b63bca50fa957649
Joe Fernandez [Thu, 13 Oct 2016 19:16:35 +0000 (19:16 +0000)]
Merge "Docs: Developer written case studies batch 3 (proj 31)" into nyc-dev am:
cae752e66b
am:
c923831485
Change-Id: Icc9e5f1076d73f5a4701f28af60fafa99f80fa72
Android Build Merger (Role) [Thu, 13 Oct 2016 19:14:06 +0000 (19:14 +0000)]
Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only am:
edd8dc83d5 am:
4cb8e2de6f" into nyc-mr1-dev-plus-aosp
Christopher Tate [Thu, 13 Oct 2016 19:13:33 +0000 (19:13 +0000)]
Retain allowBackup annotation when system+lock wallpaper becomes lock only am:
edd8dc83d5
am:
4cb8e2de6f
Change-Id: Ic4309ab74a5e9ce4893e582541e84f5160bf9d2f
George French [Thu, 13 Oct 2016 19:11:14 +0000 (19:11 +0000)]
Docs: Developer written case studies batch 3 (proj 31) am:
26ab4135ab
am:
7fc349d57b
Change-Id: Iad31d60815af6eb6d4a3b0b4f31ed38632386292
Kevin Hufnagle [Thu, 13 Oct 2016 19:10:18 +0000 (19:10 +0000)]
Merge "docs: Revised Espresso code snippets" into nyc-dev am:
aa78ed5b0a
am:
6c6080c184
Change-Id: I49963b9f7415dfcb05132c5cb9d8fa4b2231b53f
Kevin Hufnagle [Thu, 13 Oct 2016 19:08:31 +0000 (19:08 +0000)]
docs: Revised Espresso code snippets am:
d3c3c34134
am:
73b8852c9e
Change-Id: Ifee2334b45b5d387a4eccc3840260fadad4325ea
Greg Plesur [Mon, 10 Oct 2016 20:23:49 +0000 (16:23 -0400)]
DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should
return 'false' for Wear devices after pairing/upgrade.
BUG:
32019375
Change-Id: I2563efe58c98c5dd8440891e478c89e093d8d9ac
Kevin Hufnagle [Thu, 13 Oct 2016 19:07:37 +0000 (19:07 +0000)]
Merge "cherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings within IAB." into nyc-dev am:
8e4ea67fa7
am:
df40339d4b
Change-Id: I992165e933fa868d26078015a860c3b8efcc5594
Kevin Hufnagle [Thu, 13 Oct 2016 19:06:39 +0000 (19:06 +0000)]
cherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings within IAB. am:
197226e4a5
am:
ccde6c9c5e
Change-Id: Ib4394208cc8ddbadb398ff16eca4df302e759b20
Bert McMeen [Thu, 13 Oct 2016 19:05:49 +0000 (19:05 +0000)]
Docs: Remove a reference to a deprecated sample am:
3e01ab2b0e
am:
33b31ee73a
Change-Id: Ib4506eeefc13b4e207e8806cbb30846a647f4b78
Chris Tate [Thu, 13 Oct 2016 19:04:43 +0000 (19:04 +0000)]
Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only" into nyc-mr1-dev
am:
4bd56fbbee
Change-Id: I19fae35338016bbbb7de07e8c9d978bab2e088fe
Christopher Tate [Thu, 13 Oct 2016 19:04:40 +0000 (19:04 +0000)]
Retain allowBackup annotation when system+lock wallpaper becomes lock only
am:
edd8dc83d5
Change-Id: I2f3a6587bb7f53517232cf051a345e2c617b3778
Tobias Sargeant [Thu, 13 Oct 2016 19:04:39 +0000 (19:04 +0000)]
Merge "Refactor ZygoteInit to support a WebView-specific zygote." into stage-aosp-master am:
38bfbf8d2a
am:
6fd39c5cd5
Change-Id: Ie04786fe95b99a92a7dc0366e8847168372baa76
Robert Sesek [Thu, 13 Oct 2016 18:55:34 +0000 (18:55 +0000)]
Merge "resolve merge conflicts of
7031dac to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
Chris Tate [Thu, 13 Oct 2016 18:51:10 +0000 (18:51 +0000)]
Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only" into nyc-mr1-dev
Bert McMeen [Thu, 13 Oct 2016 18:16:04 +0000 (18:16 +0000)]
Docs: Updates to the Download/Test file related to watch setup am:
137c545e4e am:
58425dc58d am:
669537a9fe
am:
0a3270642c
Change-Id: I5954b87d81b8127cf8a071d51473481770d84061
Bert McMeen [Thu, 13 Oct 2016 18:03:31 +0000 (18:03 +0000)]
Docs: Updates to the Download/Test file related to watch setup am:
137c545e4e am:
58425dc58d
am:
669537a9fe
Change-Id: Ie8e8b14c46ccfda8824dccfdbf2dc3029661ad0b
Bert McMeen [Thu, 13 Oct 2016 17:50:57 +0000 (17:50 +0000)]
Docs: Updates to the Download/Test file related to watch setup am:
137c545e4e
am:
58425dc58d
Change-Id: Icf36fd2b6c4b2489a7197d32392c4a6382a934c3
Bert McMeen [Thu, 13 Oct 2016 17:38:59 +0000 (17:38 +0000)]
Docs: Updates to the Download/Test file related to watch setup
am:
137c545e4e
Change-Id: Ic605d9d26c60e3dd01cd4a9993a6d50d5cfdd94c
Vladislav Kuzkokov [Thu, 13 Oct 2016 08:49:23 +0000 (08:49 +0000)]
Merge "Revert "Fix backup for users hit by erroneous backup disabling"" into nyc-mr1-dev am:
b24489e20a
am:
d469c4e8b6
Change-Id: I79bfb43f89e1d345731cc7abcf534fe65db596c0
Vladislav Kuzkokov [Thu, 13 Oct 2016 08:48:31 +0000 (08:48 +0000)]
Revert "Fix backup for users hit by erroneous backup disabling" am:
9f61d17e6a
am:
98a145b5af
Change-Id: I82ae89b2b0ebb5fefd44fec4f10184b6bb7123d3
Vladislav Kuzkokov [Thu, 13 Oct 2016 08:41:55 +0000 (08:41 +0000)]
Merge "Revert "Fix backup for users hit by erroneous backup disabling"" into nyc-mr1-dev
am:
b24489e20a
Change-Id: Ie0f53964c521c89217347be67c16b8fe73ccc09d
Vladislav Kuzkokov [Thu, 13 Oct 2016 08:41:52 +0000 (08:41 +0000)]
Revert "Fix backup for users hit by erroneous backup disabling"
am:
9f61d17e6a
Change-Id: I460fbb670fbc7a724c981c4fceae0048ff4c9ded
Vladislav Kuzkokov [Thu, 13 Oct 2016 08:34:16 +0000 (08:34 +0000)]
Merge "Revert "Fix backup for users hit by erroneous backup disabling"" into nyc-mr1-dev
Julius D'souza [Thu, 13 Oct 2016 07:54:00 +0000 (07:54 +0000)]
Merge "DO NOT MERGE: Ambient light sensor changes for doze mode." into cw-f-dev
am:
0dcdae30cf
Change-Id: I4f1e3de590645892d84c099260ed950eb2f64e8c
Julius D'souza [Thu, 13 Oct 2016 07:53:55 +0000 (07:53 +0000)]
DO NOT MERGE: Ambient light sensor changes for doze mode.
am:
c4e1e4909d
Change-Id: I797db8f2a8607723582bb705bd667bd981d5f16f
Julius D'souza [Thu, 13 Oct 2016 07:43:17 +0000 (07:43 +0000)]
Merge "DO NOT MERGE: Ambient light sensor changes for doze mode." into cw-f-dev
Julius D'souza [Tue, 4 Oct 2016 18:05:56 +0000 (11:05 -0700)]
DO NOT MERGE: Ambient light sensor changes for doze mode.
Bug:
18573988
Change-Id: I07eed120bdbefd23408921405466566da33c397d
Andrii Kulian [Thu, 13 Oct 2016 05:08:08 +0000 (05:08 +0000)]
Merge "DO NOT MERGE -- Adjust focus when moving task back" into nyc-mr1-dev am:
1fefc8b9fa
am:
c4ceb50303
Change-Id: I48710a6b2b37827ab78285d9767e6368d481e830
Andrii Kulian [Thu, 13 Oct 2016 05:07:15 +0000 (05:07 +0000)]
DO NOT MERGE -- Adjust focus when moving task back am:
d4b98705b5
am:
75cd6ef5dc
Change-Id: I07746c065e749549c7a30820f10f24945b30c760
Andrii Kulian [Thu, 13 Oct 2016 05:01:15 +0000 (05:01 +0000)]
Merge "DO NOT MERGE -- Adjust focus when moving task back" into nyc-mr1-dev
am:
1fefc8b9fa
Change-Id: I57af7dceec243b6befbaa293438d6239053bb0ed
Andrii Kulian [Thu, 13 Oct 2016 05:01:11 +0000 (05:01 +0000)]
DO NOT MERGE -- Adjust focus when moving task back
am:
d4b98705b5
Change-Id: I1d07e84360ef0bfeb6b0ce41466e4042ca70ad81
TreeHugger Robot [Thu, 13 Oct 2016 04:47:44 +0000 (04:47 +0000)]
Merge "DO NOT MERGE -- Adjust focus when moving task back" into nyc-mr1-dev
Sungsoo [Thu, 13 Oct 2016 03:57:44 +0000 (12:57 +0900)]
ExifInterface: Provide backward compatibility
ExifInterface.saveAttribute() didn't throw UnsupportedOperationException
before. Use IOException instead of UnsupportedOperationException for
backward compatibility.
Bug:
30936376, Bug:
32068647, Bug:
31319086
Change-Id: Ifb478db3af820eb846c5373d3a284367da3495a0
Andrii Kulian [Wed, 12 Oct 2016 21:23:19 +0000 (14:23 -0700)]
DO NOT MERGE -- Adjust focus when moving task back
Resumed and focused activity should be adjusted simultaneously.
This was missing when task was moved back and focus was adjusted only
after previous activity stopped.
Bug:
31983988
Change-Id: Ie6c908b0c8c1adf94680b42ca5a8c9b01308e361
Robert Carr [Thu, 13 Oct 2016 02:23:02 +0000 (02:23 +0000)]
Merge "Correct recently introduced logic error in seamless rotation detection." into nyc-mr1-dev am:
1553d5411c
am:
708d218468
Change-Id: Ic93d5ea5c3fda6cde0368c399c8919819f4114ce
Robert Carr [Thu, 13 Oct 2016 02:22:06 +0000 (02:22 +0000)]
Correct recently introduced logic error in seamless rotation detection. am:
e441e7f15f
am:
bcbf6707b0
Change-Id: I856eec21e2d7687683a0bcde683ea6b7a05dd20a
Robert Carr [Thu, 13 Oct 2016 02:15:33 +0000 (02:15 +0000)]
Merge "Correct recently introduced logic error in seamless rotation detection." into nyc-mr1-dev
am:
1553d5411c
Change-Id: I9e12db9f686c934a2e2d391d80a0c1bb26398c7f
Robert Carr [Thu, 13 Oct 2016 02:15:31 +0000 (02:15 +0000)]
Correct recently introduced logic error in seamless rotation detection.
am:
e441e7f15f
Change-Id: I3e9bdef49a3749e82dbed82bc230bcaac958608a
TreeHugger Robot [Thu, 13 Oct 2016 02:05:30 +0000 (02:05 +0000)]
Merge "Correct recently introduced logic error in seamless rotation detection." into nyc-mr1-dev
Dianne Hackborn [Thu, 13 Oct 2016 00:20:07 +0000 (17:20 -0700)]
Fix issue #
32125907: Intent.replaceUnsafeExtras() corrupts original bundle
We now recursively generate new Bundle objects if we need to
do any stripping.
Change-Id: I4ca7896a0771c25264591ae7c79df85816d630d4
Selim Cinek [Thu, 13 Oct 2016 00:58:30 +0000 (00:58 +0000)]
Merge "Fixed a bug where the system could crash when expanding" into nyc-mr1-dev am:
0bdfc7be66
am:
77988e4aec
Change-Id: I02d6144c1b0ed72e178cd4e3899670b7d4c3d5a9
Selim Cinek [Thu, 13 Oct 2016 00:57:38 +0000 (00:57 +0000)]
Fixed a bug where the system could crash when expanding am:
3e77984434
am:
c19b510454
Change-Id: I9a08497e8c49fe916f42cac3a1d56ea5ec4fc8c3
Selim Cinek [Thu, 13 Oct 2016 00:56:39 +0000 (00:56 +0000)]
Merge "Fix crashes after notifying bad notification" into nyc-mr1-dev am:
d517c3c16b
am:
531099ae14
Change-Id: I7b05e1c54ed2ed759b5d92180edbfbdda2df841c
dooyoung.hwang [Thu, 13 Oct 2016 00:55:49 +0000 (00:55 +0000)]
Fix crashes after notifying bad notification am:
78c4114101
am:
08011cdf33
Change-Id: I679181fb5f23c48825c21d9a210e70eaca3835f2
Selim Cinek [Thu, 13 Oct 2016 00:54:53 +0000 (00:54 +0000)]
Merge "Fixed an issue where the emergency affordance would show" into nyc-mr1-dev am:
7ce68fd8a4
am:
f3eb11bdc1
Change-Id: I126575e006e20a008cfe44a370f026a81d73d267
Selim Cinek [Thu, 13 Oct 2016 00:53:56 +0000 (00:53 +0000)]
Fixed an issue where the emergency affordance would show am:
bd740cd56a
am:
c46b2ef8d2
Change-Id: Ice913b2ace0dc3962cd3b048ba847f4050c29cce
Selim Cinek [Thu, 13 Oct 2016 00:44:21 +0000 (00:44 +0000)]
Merge "Fixed a bug where the system could crash when expanding" into nyc-mr1-dev
am:
0bdfc7be66
Change-Id: Ic63b6f6bf187ea632a05a6524d3b0f8bef376b74
Selim Cinek [Thu, 13 Oct 2016 00:44:16 +0000 (00:44 +0000)]
Fixed a bug where the system could crash when expanding
am:
3e77984434
Change-Id: Icf8c8743f57a5e402275adfc645f08a10cf94a3b
Selim Cinek [Thu, 13 Oct 2016 00:42:47 +0000 (00:42 +0000)]
Merge "Fix crashes after notifying bad notification" into nyc-mr1-dev
am:
d517c3c16b
Change-Id: I07d4f185a096c22628cd0d0ffcb789391a81f518
dooyoung.hwang [Thu, 13 Oct 2016 00:42:44 +0000 (00:42 +0000)]
Fix crashes after notifying bad notification
am:
78c4114101
Change-Id: I4d72feb9a40b99c5b40307ad01d708b3a66d1f54
Selim Cinek [Thu, 13 Oct 2016 00:41:27 +0000 (00:41 +0000)]
Merge "Fixed an issue where the emergency affordance would show" into nyc-mr1-dev
am:
7ce68fd8a4
Change-Id: I775e64348075fe1dd57a7133fcdc7b11f79415d6
Selim Cinek [Thu, 13 Oct 2016 00:41:24 +0000 (00:41 +0000)]
Fixed an issue where the emergency affordance would show
am:
bd740cd56a
Change-Id: I6ce705cc701bf149dec45feabcf4777cc89afa6a
Selim Cinek [Thu, 13 Oct 2016 00:37:27 +0000 (00:37 +0000)]
Merge "Fixed a bug where the system could crash when expanding" into nyc-mr1-dev
Selim Cinek [Thu, 13 Oct 2016 00:36:27 +0000 (00:36 +0000)]
Merge "Fix crashes after notifying bad notification" into nyc-mr1-dev
Selim Cinek [Thu, 13 Oct 2016 00:29:57 +0000 (00:29 +0000)]
Merge "Fixed an issue where the emergency affordance would show" into nyc-mr1-dev
Christopher Tate [Wed, 12 Oct 2016 22:17:58 +0000 (15:17 -0700)]
Retain allowBackup annotation when system+lock wallpaper becomes lock only
Bug
32069467
Change-Id: I5d0b91c40e1a2896f2b11efeef7bff84503cf2c0
Adrian Roos [Wed, 12 Oct 2016 23:26:15 +0000 (23:26 +0000)]
Merge "Fix Notification.Action.Builder copy constructor" into nyc-mr1-dev am:
5c8fc58850
am:
b920d48e0a
Change-Id: Ie7d699fa304be1b75e7037d75c02ab5302a3205d
Adrian Roos [Wed, 12 Oct 2016 23:25:20 +0000 (23:25 +0000)]
Fix Notification.Action.Builder copy constructor am:
7af5362571
am:
342bc437bf
Change-Id: I0387ab66ec3d44e34a884fb2f92f32af35e2883c
Adrian Roos [Wed, 12 Oct 2016 23:19:22 +0000 (23:19 +0000)]
Merge "Fix Notification.Action.Builder copy constructor" into nyc-mr1-dev
am:
5c8fc58850
Change-Id: Ic9b035247f5b09582adf20c7cb47361f7b035cf7
OSDN Git Service
