OSDN Git Service
Bill Yi [Wed, 24 Aug 2016 20:32:08 +0000 (20:32 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am:
e71ecb2c4d am:
1bf3b41c0c
am:
b92c637fec
Change-Id: I7594dc32c819bc856d879dd9b5f85cef7e9a7c77
Sergio Giro [Wed, 24 Aug 2016 20:32:04 +0000 (20:32 +0000)]
Merge "javax.crypto.spec: update PBEParameterSpec to Java 8" am:
5d4732555d am:
3b7c46af6f
am:
abef050951
Change-Id: I9b75a23af362663f80e66cafb620fe4846060fdd
Sergio Giro [Wed, 24 Aug 2016 20:32:02 +0000 (20:32 +0000)]
Merge "javax.crypto: update classes in javax.crypto (part 2)" am:
c7f97dbd57 am:
1384be9641
am:
8d9a8759af
Change-Id: If8a55d5733a0b7a564df80aeec0383d3eb119006
Sergio Giro [Wed, 24 Aug 2016 20:31:59 +0000 (20:31 +0000)]
Merge "java.security.spec: add public field in MGF1ParameterSpec" am:
5b24bccbc8 am:
08b6a09f32
am:
77322b04e6
Change-Id: I61d5981111943430ca34603a67d823b0efab43aa
Bill Yi [Wed, 24 Aug 2016 20:21:34 +0000 (20:21 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am:
e71ecb2c4d
am:
1bf3b41c0c
Change-Id: Ieb98d7845f5e27a7e17ebe5fb59c5a96ac1c32d4
Sergio Giro [Wed, 24 Aug 2016 20:21:30 +0000 (20:21 +0000)]
Merge "javax.crypto.spec: update PBEParameterSpec to Java 8" am:
5d4732555d
am:
3b7c46af6f
Change-Id: I83f4e28e8f51cec728461e6db3c7d4ee8370b7fd
Sergio Giro [Wed, 24 Aug 2016 20:21:27 +0000 (20:21 +0000)]
Merge "javax.crypto: update classes in javax.crypto (part 2)" am:
c7f97dbd57
am:
1384be9641
Change-Id: I176a6a4d2bfc0102d2e7ce1570492fddf459cecc
Sergio Giro [Wed, 24 Aug 2016 20:21:24 +0000 (20:21 +0000)]
Merge "java.security.spec: add public field in MGF1ParameterSpec" am:
5b24bccbc8
am:
08b6a09f32
Change-Id: I6ccd70b3d20c28e54e1c7d5029cc3955bdc9e633
Jakub Pawlowski [Wed, 24 Aug 2016 20:21:17 +0000 (20:21 +0000)]
Merge "Add WorkSource to BLE scanning API" am:
d0a0ae349c -s ours am:
2fde849eaf
am:
9e948dc372
Change-Id: Ie75a4f18240f8a794de0f1c0507fcc0362601f86
Jakub Pawlowski [Wed, 24 Aug 2016 20:15:35 +0000 (20:15 +0000)]
Merge "Add WorkSource to BLE scanning API" am:
d0a0ae349c -s ours
am:
2fde849eaf
Change-Id: Ie4c068313af530848f7955bdae9ce70b462d050d
Bill Yi [Wed, 24 Aug 2016 20:11:30 +0000 (20:11 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am:
e71ecb2c4d
Change-Id: Ic7d3bae780b52236b3fff2ab4d97ce1557129f0f
Sergio Giro [Wed, 24 Aug 2016 20:11:24 +0000 (20:11 +0000)]
Merge "javax.crypto.spec: update PBEParameterSpec to Java 8"
am:
5d4732555d
Change-Id: I2cf28d3cd14a2e9de7835082c459310b9ff9679b
Sergio Giro [Wed, 24 Aug 2016 20:11:15 +0000 (20:11 +0000)]
Merge "javax.crypto: update classes in javax.crypto (part 2)"
am:
c7f97dbd57
Change-Id: Icb0abdcda06a9a7d450bc3f9af1e5dc474f1c7db
Sergio Giro [Wed, 24 Aug 2016 20:11:04 +0000 (20:11 +0000)]
Merge "java.security.spec: add public field in MGF1ParameterSpec"
am:
5b24bccbc8
Change-Id: I2fb2099cee414dc417ced879e0400cd7ff1dce3d
Jakub Pawlowski [Wed, 24 Aug 2016 20:06:47 +0000 (20:06 +0000)]
Merge "Add WorkSource to BLE scanning API"
am:
d0a0ae349c -s ours
Change-Id: I9522e2749aac82c71d08405478944346fc9d3ba1
Steve McKay [Wed, 24 Aug 2016 20:00:53 +0000 (20:00 +0000)]
Merge "DO NOT MERGE: Don't create DocumentInfo instances in background." into nyc-mr1-dev am:
850912db88
am:
b9b65370b7
Change-Id: I7d3e58784a5c1e78ba57ec9d85f36c43ab9ecf34
Steve McKay [Wed, 24 Aug 2016 20:00:50 +0000 (20:00 +0000)]
DO NOT MERGE: Don't create DocumentInfo instances in background. am:
b818058f4e
am:
89eb830a73
Change-Id: I66d7c1fda5ddc573db4e23902110f1ad59d8cadd
Steve McKay [Wed, 24 Aug 2016 19:55:25 +0000 (19:55 +0000)]
Merge "DO NOT MERGE: Don't create DocumentInfo instances in background." into nyc-mr1-dev
am:
850912db88
Change-Id: Iaa44a8af85622bfa508df06eef46645966735457
Steve McKay [Wed, 24 Aug 2016 19:55:22 +0000 (19:55 +0000)]
DO NOT MERGE: Don't create DocumentInfo instances in background.
am:
b818058f4e
Change-Id: Ib43fd7c9cba300821a908f7036415b8b1635bb4a
TreeHugger Robot [Wed, 24 Aug 2016 19:49:34 +0000 (19:49 +0000)]
Merge "DO NOT MERGE: Don't create DocumentInfo instances in background." into nyc-mr1-dev
Salvador Martinez [Wed, 24 Aug 2016 18:52:48 +0000 (18:52 +0000)]
Merge "Added error handling to settings suggestions list" into nyc-dev am:
ed004e2958 am:
e9c519e049 am:
e8e7f1b88a
am:
347f0c6612
Change-Id: Idc32b2a923aa6d58877f12c313494887bb4b3132
Salvador Martinez [Wed, 24 Aug 2016 18:52:43 +0000 (18:52 +0000)]
Added error handling to settings suggestions list am:
18bf581c77 am:
2cb851e5c9 am:
cfa4ad4e1e
am:
b14e30fc84
Change-Id: Ifc5a4825b87309d00a3092916475f95f96d5916e
Alan Viverette [Wed, 24 Aug 2016 18:47:27 +0000 (18:47 +0000)]
Merge "Ensure the layer drawable callback is set when loading from theme" into nyc-mr1-dev am:
709f0f3e15
am:
352ccc9f84
Change-Id: I894a043c05320ee7444ab7caad207652d6bae18b
Alan Viverette [Wed, 24 Aug 2016 18:46:58 +0000 (18:46 +0000)]
Ensure the layer drawable callback is set when loading from theme am:
11a84b8429
am:
3deb906397
Change-Id: I31e90f3871f4612fe74cbdabc49fde94a8940d83
Alan Viverette [Wed, 24 Aug 2016 18:46:24 +0000 (18:46 +0000)]
Merge "Improve docs for GradientDrawable's useLevel and centerX/Y properties" into nyc-mr1-dev am:
20109a689d
am:
56d8f4e2b4
Change-Id: Ie8e52ba6257389a4205a083ce28fc11f8a630637
Alan Viverette [Wed, 24 Aug 2016 18:45:49 +0000 (18:45 +0000)]
Improve docs for GradientDrawable's useLevel and centerX/Y properties am:
daec5506c4
am:
cc914b6b0b
Change-Id: I52f3e1d28cca58babce095852fea9f2c3da94422
Alan Viverette [Wed, 24 Aug 2016 18:44:25 +0000 (18:44 +0000)]
Merge "Clean up VideoView, SurfaceView constructors" into nyc-mr1-dev am:
16b8941dba
am:
040e5d8ce3
Change-Id: I2621ae75f4920c0370f4e0334ed07efb45c4e674
Alan Viverette [Wed, 24 Aug 2016 18:43:53 +0000 (18:43 +0000)]
Clean up VideoView, SurfaceView constructors am:
768ca7d19b
am:
9af5e5b31b
Change-Id: Ic017d3855d81b3a6fbc72fd4c256f55584e453da
Alan Viverette [Wed, 24 Aug 2016 18:43:21 +0000 (18:43 +0000)]
Merge "Constrain input hour and minute to valid range" into nyc-mr1-dev am:
4e32b47c48
am:
31be04fddd
Change-Id: I212bbb5057ba55c66864b436ea08a0f8eefb7851
Alan Viverette [Wed, 24 Aug 2016 18:42:47 +0000 (18:42 +0000)]
Constrain input hour and minute to valid range am:
f0ac2ba9f4
am:
a2c9a8c274
Change-Id: Ifc3701f407620892909d8228a330d4b7e0af101c
Alan Viverette [Wed, 24 Aug 2016 18:41:21 +0000 (18:41 +0000)]
Merge "Override LinearLayout's onLayout pass in AlertDialogLayout" into nyc-mr1-dev am:
52306705c1
am:
3bc48eec3d
Change-Id: I7a7ea1ee5d04f595795b85f8b6d61d879fd2e496
Alan Viverette [Wed, 24 Aug 2016 18:40:51 +0000 (18:40 +0000)]
Override LinearLayout's onLayout pass in AlertDialogLayout am:
1bb8f51e76
am:
ab508dd52b
Change-Id: I7a5999488de62d391bf0a33dca223e77cebff86d
Salvador Martinez [Wed, 24 Aug 2016 18:40:05 +0000 (18:40 +0000)]
Merge "Added error handling to settings suggestions list" into nyc-dev am:
ed004e2958 am:
e9c519e049
am:
e8e7f1b88a
Change-Id: If2f11f73da080be1483eb49d36f83ee6034ecf45
Salvador Martinez [Wed, 24 Aug 2016 18:40:02 +0000 (18:40 +0000)]
Added error handling to settings suggestions list am:
18bf581c77 am:
2cb851e5c9
am:
cfa4ad4e1e
Change-Id: Iad0b0a73b544ca2eb7a2ea38cefd16fddd960443
Alan Viverette [Wed, 24 Aug 2016 18:34:28 +0000 (18:34 +0000)]
Merge "Ensure the layer drawable callback is set when loading from theme" into nyc-mr1-dev
am:
709f0f3e15
Change-Id: I7b744d8eac043ca4e18bb43ad25bddb438711269
Alan Viverette [Wed, 24 Aug 2016 18:34:26 +0000 (18:34 +0000)]
Ensure the layer drawable callback is set when loading from theme
am:
11a84b8429
Change-Id: Ia6994252d09b6cc008847cd0e084949ada7b2ab2
Alan Viverette [Wed, 24 Aug 2016 18:33:58 +0000 (18:33 +0000)]
Merge "Improve docs for GradientDrawable's useLevel and centerX/Y properties" into nyc-mr1-dev
am:
20109a689d
Change-Id: Ie3031e5218f0ed02b1fc7726fc6ac0aa39db8c56
Alan Viverette [Wed, 24 Aug 2016 18:32:55 +0000 (18:32 +0000)]
Improve docs for GradientDrawable's useLevel and centerX/Y properties
am:
daec5506c4
Change-Id: If6c4b531a17abbed1a06478ec263bc89242638b3
Salvador Martinez [Wed, 24 Aug 2016 18:32:11 +0000 (18:32 +0000)]
Merge "Added error handling to settings suggestions list" into nyc-dev am:
ed004e2958
am:
e9c519e049
Change-Id: Ie99c9e7d6747866efb03484dbbeec89d4dc6d74b
Salvador Martinez [Wed, 24 Aug 2016 18:32:09 +0000 (18:32 +0000)]
Added error handling to settings suggestions list am:
18bf581c77
am:
2cb851e5c9
Change-Id: I5f28a0c854597a576791be97fd1ab0c87183d65d
Alan Viverette [Wed, 24 Aug 2016 18:32:07 +0000 (18:32 +0000)]
Merge "Clean up VideoView, SurfaceView constructors" into nyc-mr1-dev
am:
16b8941dba
Change-Id: I37e7ad00f3bbffaf686d22ad1a3dd452d8a20b49
Alan Viverette [Wed, 24 Aug 2016 18:31:38 +0000 (18:31 +0000)]
Clean up VideoView, SurfaceView constructors
am:
768ca7d19b
Change-Id: Ia3ff40a2c6dbbb2a725bc6306401de3cd662ba33
Alan Viverette [Wed, 24 Aug 2016 18:31:11 +0000 (18:31 +0000)]
Merge "Constrain input hour and minute to valid range" into nyc-mr1-dev
am:
4e32b47c48
Change-Id: I438a71a44830afb128e107847ec5bca4499073c8
Alan Viverette [Wed, 24 Aug 2016 18:30:20 +0000 (18:30 +0000)]
Constrain input hour and minute to valid range
am:
f0ac2ba9f4
Change-Id: I5f365e4869f0aabec71e478d9cba4edc3ce30900
Alan Viverette [Wed, 24 Aug 2016 18:29:18 +0000 (18:29 +0000)]
Merge "Override LinearLayout's onLayout pass in AlertDialogLayout" into nyc-mr1-dev
am:
52306705c1
Change-Id: Ia0b9ea70f0c086149cc145bb50dc5dadaa167e40
Alan Viverette [Wed, 24 Aug 2016 18:28:40 +0000 (18:28 +0000)]
Override LinearLayout's onLayout pass in AlertDialogLayout
am:
1bb8f51e76
Change-Id: I63af639e859e2b7c72d93233c5b9ec7da2bb01cf
Salvador Martinez [Wed, 24 Aug 2016 18:28:34 +0000 (18:28 +0000)]
Merge "Added error handling to settings suggestions list" into nyc-dev am:
ed004e2958
am:
3253853473
Change-Id: Id49fc3e28a6b9b9507b7a2e7c2f942d38ffa4be1
Salvador Martinez [Wed, 24 Aug 2016 18:28:31 +0000 (18:28 +0000)]
Added error handling to settings suggestions list am:
18bf581c77
am:
23af0c020b
Change-Id: Ie87dc8bb52a4337bb63402e6ea002b254ed4157b
Salvador Martinez [Wed, 24 Aug 2016 18:28:00 +0000 (18:28 +0000)]
Merge "Added error handling to settings suggestions list" into nyc-dev
am:
ed004e2958
Change-Id: I674216ef4471444c86b202896b8ce055c54eb584
Salvador Martinez [Wed, 24 Aug 2016 18:27:56 +0000 (18:27 +0000)]
Added error handling to settings suggestions list
am:
18bf581c77
Change-Id: Id946b2b75b9adc4c70fa4537da4ac509a6ab5c66
Bill Yi [Wed, 24 Aug 2016 18:23:13 +0000 (11:23 -0700)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Change-Id: I1c7301e4e6d7e5fed1fd57d2fb9cb65baf819de0
Salvador Martinez [Wed, 24 Aug 2016 18:22:11 +0000 (18:22 +0000)]
Merge "Added error handling to settings suggestions list" into nyc-dev
am:
ed004e2958
Change-Id: I5d65ce33e3b5e8c8f97827a48e49ddf9a437f76b
Salvador Martinez [Wed, 24 Aug 2016 18:22:05 +0000 (18:22 +0000)]
Added error handling to settings suggestions list
am:
18bf581c77
Change-Id: If17623712eeea0e1aced3acedec24c27509e3bbc
Chen Xu [Wed, 24 Aug 2016 18:19:30 +0000 (18:19 +0000)]
Merge changes from topic 'am-
25ded4410ce544918d9fbc387ab4e1e3' into cw-f-dev
am:
8ae79de881
Change-Id: Ide0bb4898016ea1b345e4864c6973938e55308fe
Chen Xu [Wed, 24 Aug 2016 18:19:08 +0000 (18:19 +0000)]
Merge "redact PII only for non-null value and apply SHA-1" into nyc-mr1-dev am:
d90b69ffb1
am:
3e73c0c93e
Change-Id: Ibf75bc3523cf808856942c2a73fc8e7ecc2319bb
fionaxu [Wed, 24 Aug 2016 18:18:35 +0000 (18:18 +0000)]
redact PII only for non-null value and apply SHA-1 am:
d0a7649f53
am:
00396c01f6
Change-Id: Ibbf6e47c2241f03998a8321aed78f819c87c40e7
Andrew Rossignol [Wed, 24 Aug 2016 18:18:25 +0000 (18:18 +0000)]
Merge "Remove the incognito start page resource." into cw-f-dev
am:
e914569fb8
Change-Id: Iacfa4efd0689c78bfe5b1722f3d8f8648c4a414e
Andrew Rossignol [Wed, 24 Aug 2016 18:18:22 +0000 (18:18 +0000)]
Remove the incognito start page resource.
am:
09bd81cdfe
Change-Id: Ib213873d3b29fab741d9e90ec38cab2f5462ac2a
Salvador Martinez [Wed, 24 Aug 2016 18:17:38 +0000 (18:17 +0000)]
Merge "Added error handling to settings suggestions list" into nyc-dev
Alan Viverette [Wed, 24 Aug 2016 18:17:02 +0000 (18:17 +0000)]
Merge "Ensure the layer drawable callback is set when loading from theme" into nyc-mr1-dev
Alan Viverette [Wed, 24 Aug 2016 18:17:02 +0000 (18:17 +0000)]
Merge "Improve docs for GradientDrawable's useLevel and centerX/Y properties" into nyc-mr1-dev
Alan Viverette [Wed, 24 Aug 2016 18:17:02 +0000 (18:17 +0000)]
Merge "Clean up VideoView, SurfaceView constructors" into nyc-mr1-dev
Alan Viverette [Wed, 24 Aug 2016 18:17:02 +0000 (18:17 +0000)]
Merge "Constrain input hour and minute to valid range" into nyc-mr1-dev
Alan Viverette [Wed, 24 Aug 2016 18:17:02 +0000 (18:17 +0000)]
Merge "Override LinearLayout's onLayout pass in AlertDialogLayout" into nyc-mr1-dev
Android Build Merger (Role) [Wed, 24 Aug 2016 18:13:59 +0000 (18:13 +0000)]
Merge changes from topic 'am-
25ded4410ce544918d9fbc387ab4e1e3' into cw-f-dev
* changes:
Merge "redact PII only for non-null value and apply SHA-1" into nyc-mr1-dev am:
d90b69ffb1
redact PII only for non-null value and apply SHA-1 am:
d0a7649f53
Andrew Rossignol [Wed, 24 Aug 2016 18:13:01 +0000 (18:13 +0000)]
Merge "Remove the incognito start page resource." into cw-f-dev
Chen Xu [Wed, 24 Aug 2016 18:12:48 +0000 (18:12 +0000)]
Merge "redact PII only for non-null value and apply SHA-1" into nyc-mr1-dev
am:
d90b69ffb1
Change-Id: Iab3db28183e0756f65c8ccea29196002fe608904
fionaxu [Wed, 24 Aug 2016 18:12:43 +0000 (18:12 +0000)]
redact PII only for non-null value and apply SHA-1
am:
d0a7649f53
Change-Id: I4424a97dc00444df80c53fe4bbb20dfb7840e441
Doris Ling [Wed, 24 Aug 2016 18:11:34 +0000 (18:11 +0000)]
Merge "Add metrics logging for Settings -> Help & Feedback" into nyc-mr1-dev am:
d5f9642488
am:
6165a83ee8
Change-Id: I57e747977143413133a8bae88a22aad279e0d1dd
Doris Ling [Wed, 24 Aug 2016 18:11:30 +0000 (18:11 +0000)]
Add metrics logging for Settings -> Help & Feedback am:
319c806cc0
am:
589ffca4de
Change-Id: I23e27e84aa81a986b5cdba3bb19b2c22003601cd
Chen Xu [Wed, 24 Aug 2016 18:08:19 +0000 (18:08 +0000)]
Merge "redact PII only for non-null value and apply SHA-1" into nyc-mr1-dev
Doris Ling [Wed, 24 Aug 2016 18:04:42 +0000 (18:04 +0000)]
Merge "Add metrics logging for Settings -> Help & Feedback" into nyc-mr1-dev
am:
d5f9642488
Change-Id: Ib3f80a096d333e7bd3dbdfb57a91be41d4aa823b
Doris Ling [Wed, 24 Aug 2016 18:04:39 +0000 (18:04 +0000)]
Add metrics logging for Settings -> Help & Feedback
am:
319c806cc0
Change-Id: I32966869e910b4c6e36fe3245af2edfa7a6f6a87
Doris Ling [Wed, 24 Aug 2016 18:01:26 +0000 (18:01 +0000)]
Merge "Add metrics logging for Settings -> Help & Feedback" into nyc-mr1-dev
Alan Viverette [Wed, 24 Aug 2016 17:56:15 +0000 (17:56 +0000)]
Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev am:
462f29f77f am:
f9489216eb am:
6c1e7451b3
am:
57143be4e4
Change-Id: I58b316d3fa16e275caf388a1365327e3af3cb118
Alan Viverette [Wed, 24 Aug 2016 17:56:10 +0000 (17:56 +0000)]
Avoid potential re-entry as a result of child mutation am:
66b3a0d1aa am:
70ccc698ec am:
992ef58a33
am:
cc0e9d795e
Change-Id: I04786a4a24deff08a01f4adb60f8a686711bbd42
Alan Viverette [Wed, 24 Aug 2016 17:49:58 +0000 (17:49 +0000)]
Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev am:
462f29f77f am:
f9489216eb
am:
6c1e7451b3
Change-Id: If5ce87ac37637948aae79af46ca54b4d4be13985
Alan Viverette [Wed, 24 Aug 2016 17:49:55 +0000 (17:49 +0000)]
Avoid potential re-entry as a result of child mutation am:
66b3a0d1aa am:
70ccc698ec
am:
992ef58a33
Change-Id: Ie07b98d2006707d177beb2c43d31f3d28917dc91
Alan Viverette [Wed, 24 Aug 2016 17:43:46 +0000 (17:43 +0000)]
Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev am:
462f29f77f
am:
550e677563
Change-Id: I17d8763eb2fafcae7ecca9fbe1eb71dbc67926d8
Alan Viverette [Wed, 24 Aug 2016 17:43:45 +0000 (17:43 +0000)]
Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev am:
462f29f77f
am:
f9489216eb
Change-Id: If2389e3de3f5b511ed0ac7cee1025ec2d31cbabc
Alan Viverette [Wed, 24 Aug 2016 17:43:43 +0000 (17:43 +0000)]
Avoid potential re-entry as a result of child mutation am:
66b3a0d1aa
am:
70ccc698ec
Change-Id: Ia85253ba6ce6bece037717b7d87955dcac4e9f81
Alan Viverette [Wed, 24 Aug 2016 17:43:43 +0000 (17:43 +0000)]
Avoid potential re-entry as a result of child mutation am:
66b3a0d1aa
am:
387ebba861
Change-Id: I9cd0c4d86d1e7e1e8328b32e2d7db7385cbee5bb
Alan Viverette [Wed, 24 Aug 2016 17:37:54 +0000 (17:37 +0000)]
Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev
am:
462f29f77f
Change-Id: I0ea5702480dc7289dbad31355a6e403d39ab3c90
Alan Viverette [Wed, 24 Aug 2016 17:37:53 +0000 (17:37 +0000)]
Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev
am:
462f29f77f
Change-Id: Iefb3d33a407aa719c988217b136187378617da8f
Alan Viverette [Wed, 24 Aug 2016 17:37:51 +0000 (17:37 +0000)]
Avoid potential re-entry as a result of child mutation
am:
66b3a0d1aa
Change-Id: Ia4ece22b06ef087921e8c341ec7112fd271598f2
Alan Viverette [Wed, 24 Aug 2016 17:37:50 +0000 (17:37 +0000)]
Avoid potential re-entry as a result of child mutation
am:
66b3a0d1aa
Change-Id: I1fa6619145a6aaceb4c743d378fbc5b198da6cdd
TreeHugger Robot [Wed, 24 Aug 2016 17:27:07 +0000 (17:27 +0000)]
Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev
Tony Mantler [Wed, 24 Aug 2016 17:10:08 +0000 (17:10 +0000)]
Merge "Fix AsyncTask to handle exceptions in doInBackground" into nyc-mr1-dev am:
97231323b7
am:
b07fc2c9bf
Change-Id: Ideb04ea8f21228ab7bdb091f4404b8918eb37e3e
Tony Mantler [Wed, 24 Aug 2016 17:10:05 +0000 (17:10 +0000)]
Fix AsyncTask to handle exceptions in doInBackground am:
78a8e9d293
am:
7697ba2602
Change-Id: Iec4b849fb0badc94f37791bd7389eacc63b68bc2
Tony Mantler [Wed, 24 Aug 2016 17:05:17 +0000 (17:05 +0000)]
Merge "Fix AsyncTask to handle exceptions in doInBackground" into nyc-mr1-dev
am:
97231323b7
Change-Id: Iae6db760981058999637d93017b1cb11c6ebb802
Tony Mantler [Wed, 24 Aug 2016 17:05:13 +0000 (17:05 +0000)]
Fix AsyncTask to handle exceptions in doInBackground
am:
78a8e9d293
Change-Id: Ie56e95882f0aa1224a4eb03ac25374bb08454d2c
Tony Mantler [Wed, 24 Aug 2016 17:00:02 +0000 (17:00 +0000)]
Merge "Fix AsyncTask to handle exceptions in doInBackground" into nyc-mr1-dev
Randy Pan [Wed, 24 Aug 2016 16:54:39 +0000 (16:54 +0000)]
Merge "Deprecate QNS network disable reason BAD_LINK" into nyc-mr1-dev-plus-aosp
Salvador Martinez [Thu, 4 Aug 2016 20:37:52 +0000 (13:37 -0700)]
Added error handling to settings suggestions list
The suggestions list in the summary page of the
settings app could sometimes cause a crash due to
an uncaught exception. Tis fixed now.
Bug:
30656840
Change-Id: If79f53e6a8c17a81653228d613797e94c473d410
(cherry picked from commit
60d92b3b8390e33e069f343d6a425ab07c498d3d)
Tenghui Zhu [Wed, 24 Aug 2016 16:37:11 +0000 (16:37 +0000)]
Merge "Add an new internal DrawableContainer to handle animation scale == 0 case." into nyc-mr1-dev am:
3512b0001a
am:
f286d846f0
Change-Id: Ib52cba508e4051fc4d846f7e670eb2deaf58da12
Teng-Hui Zhu [Wed, 24 Aug 2016 16:36:30 +0000 (16:36 +0000)]
Add an new internal DrawableContainer to handle animation scale == 0 case. am:
0c03664fa6
am:
0bc9fa9896
Change-Id: I10fe7a99a8857ce76181c98da30287916dc7aab4
Alan Viverette [Wed, 24 Aug 2016 16:35:47 +0000 (12:35 -0400)]
Ensure the layer drawable callback is set when loading from theme
Previously we would skip setting the changing configurations and callback
if the drawable had been loaded post-inflation from a theme attribute.
Bug:
30756548
Change-Id: Ia5457723ae8a62506a7562299d3fe78ec21f8030
Tenghui Zhu [Wed, 24 Aug 2016 16:29:40 +0000 (16:29 +0000)]
Merge "Add an new internal DrawableContainer to handle animation scale == 0 case." into nyc-mr1-dev
am:
3512b0001a
Change-Id: Iac78966a4ff7d4d7bb6972a1624a7587b68c224e
Teng-Hui Zhu [Wed, 24 Aug 2016 16:28:55 +0000 (16:28 +0000)]
Add an new internal DrawableContainer to handle animation scale == 0 case.
am:
0c03664fa6
Change-Id: I7feae01c6302e2942087c6dfe1948109467f1326
Alan Viverette [Wed, 24 Aug 2016 16:26:27 +0000 (12:26 -0400)]
Override LinearLayout's onLayout pass in AlertDialogLayout
LinearLayout sets up internal state during onLayout that's missing when
we override onMeasure. Avoid calling super.onMeasure() by re-implementing
onLayout without the internal state dependencies.
Bug:
30494039
Change-Id: I1149517a2fe5f5afdb4125db5e7f573588fea740
OSDN Git Service
