OSDN Git Service
Android Build Merger (Role) [Fri, 9 Jun 2017 23:39:37 +0000 (23:39 +0000)]
Merge "Merge "Fix thread booster" into oc-dev am:
4c1209e00e am:
c48a8176e8" into oc-dr1-dev-plus-aosp
Jorim Jaggi [Fri, 9 Jun 2017 23:38:50 +0000 (23:38 +0000)]
Merge "Fix thread booster" into oc-dev am:
4c1209e00e
am:
c48a8176e8
Change-Id: I30b49d87ad875b6a0bc30177959a2197cfc5a0b8
Jorim Jaggi [Fri, 9 Jun 2017 23:37:22 +0000 (23:37 +0000)]
Merge "Fix thread booster" into oc-dev am:
4c1209e00e
am:
2bdff7d64e
Change-Id: I3dc39403e74581946f90f0d9b21e981694e752ab
Android Build Merger (Role) [Fri, 9 Jun 2017 23:34:08 +0000 (23:34 +0000)]
Merge "Merge "Removed test from presubmit." into oc-dev am:
4f30aa2be8 am:
ed268dc350" into oc-dr1-dev-plus-aosp
Jorim Jaggi [Fri, 9 Jun 2017 23:33:16 +0000 (23:33 +0000)]
Merge "Fix thread booster" into oc-dev
am:
4c1209e00e
Change-Id: I3ef8bce9cd703a630280595a47baebae12c28387
Lucas Dupin [Fri, 9 Jun 2017 23:33:16 +0000 (23:33 +0000)]
Merge "Removed test from presubmit." into oc-dev am:
4f30aa2be8
am:
ed268dc350
Change-Id: I202bed758385f4918452d78dfef42682521132df
Lucas Dupin [Fri, 9 Jun 2017 23:31:01 +0000 (23:31 +0000)]
Merge "Removed test from presubmit." into oc-dev am:
4f30aa2be8
am:
c9d11b7e83
Change-Id: I94a073c6151d19a40a5fea2db5871b6dc970de80
Jorim Jaggi [Fri, 9 Jun 2017 23:30:24 +0000 (23:30 +0000)]
Merge "Fix thread booster" into oc-dev
am:
4c1209e00e
Change-Id: Iea1b674cefc1d63eaeb77511904afcf4fdc7639e
Lucas Dupin [Fri, 9 Jun 2017 23:26:36 +0000 (23:26 +0000)]
Merge "Removed test from presubmit." into oc-dev
am:
4f30aa2be8
Change-Id: I3f73f3581fad4575f774f2c5ba870cc3308443a4
Jorim Jaggi [Fri, 9 Jun 2017 23:23:56 +0000 (23:23 +0000)]
Merge "Fix thread booster" into oc-dev
Lucas Dupin [Fri, 9 Jun 2017 23:23:20 +0000 (23:23 +0000)]
Merge "Removed test from presubmit." into oc-dev
am:
4f30aa2be8
Change-Id: I49a803f8ecadfab53a686c91c601aaead8a1c81f
Hugo Benichi [Fri, 9 Jun 2017 23:23:17 +0000 (23:23 +0000)]
Merge "Instrument captive portal login activity" into oc-dr1-dev
am:
169f7bebce
Change-Id: I25f8400556ed82e32bbb7abd6e3fccd3df83cd5f
Hugo Benichi [Fri, 9 Jun 2017 23:17:22 +0000 (23:17 +0000)]
Merge "Instrument captive portal login activity" into oc-dr1-dev
TreeHugger Robot [Fri, 9 Jun 2017 23:17:13 +0000 (23:17 +0000)]
Merge "Removed test from presubmit." into oc-dev
Android Build Merger (Role) [Fri, 9 Jun 2017 23:16:26 +0000 (23:16 +0000)]
Merge "Merge "" into oc-dev am:
0aaae4ae78 am:
770a4f20cc" into oc-dr1-dev-plus-aosp
Daniel Sandler [Fri, 9 Jun 2017 23:13:58 +0000 (23:13 +0000)]
Merge "" into oc-dev am:
0aaae4ae78
am:
9bb81db15e
Change-Id: Ic0654fa608e873075938dd2b4ad5aaafd59cc2eb
Daniel Sandler [Fri, 9 Jun 2017 23:13:57 +0000 (23:13 +0000)]
Merge "" into oc-dev am:
0aaae4ae78
am:
770a4f20cc
Change-Id: Idc25cc03b6c6d9f2441b90487757dea1e795d48c
Daniel Sandler [Fri, 9 Jun 2017 23:05:29 +0000 (23:05 +0000)]
Merge "" into oc-dev
am:
0aaae4ae78
Change-Id: Ibeceac21612da6669d0a216729c2671170651480
Daniel Sandler [Fri, 9 Jun 2017 23:05:19 +0000 (23:05 +0000)]
Merge "" into oc-dev
am:
0aaae4ae78
Change-Id: Ic671cd9a8718509728f6058b8d8b695cefbdc0f3
Daniel Sandler [Fri, 9 Jun 2017 22:55:42 +0000 (22:55 +0000)]
Merge "🐙" into oc-dev
Android Build Merger (Role) [Fri, 9 Jun 2017 22:27:07 +0000 (22:27 +0000)]
Merge "Merge "Merge "Minor fix on autofill() javadoc." into oc-dev am:
211e760408" into oc-dev-plus-aosp am:
c3f93e120c" into oc-dr1-dev-plus-aosp
Felipe Leme [Fri, 9 Jun 2017 22:26:02 +0000 (22:26 +0000)]
Merge "Merge "Minor fix on autofill() javadoc." into oc-dev am:
211e760408" into oc-dev-plus-aosp
am:
c3f93e120c
Change-Id: Iaaf0f43a5d395110633c261e2f73025a284821b7
Android Build Merger (Role) [Fri, 9 Jun 2017 22:25:32 +0000 (22:25 +0000)]
Merge "Merge "Update documentation for streaming methods" am:
186a588d57 am:
01604ebfc1 am:
cfbb73bcde" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 9 Jun 2017 22:25:08 +0000 (22:25 +0000)]
Merge "Merge "Minor fix on autofill() javadoc." into oc-dev am:
211e760408 am:
d11e14b428" into oc-dr1-dev-plus-aosp
Hall Liu [Fri, 9 Jun 2017 22:24:40 +0000 (22:24 +0000)]
Merge "Update documentation for streaming methods" am:
186a588d57 am:
01604ebfc1
am:
cfbb73bcde
Change-Id: Ib841554ba1ad15eceefcbb2ee32599e1087b9f76
Felipe Leme [Fri, 9 Jun 2017 22:24:17 +0000 (22:24 +0000)]
Merge "Minor fix on autofill() javadoc." into oc-dev am:
211e760408
am:
d11e14b428
Change-Id: I80bd1592ca2b093e263f2ddfedc174dc401ec567
Android Build Merger (Role) [Fri, 9 Jun 2017 22:24:01 +0000 (22:24 +0000)]
Merge "Add missing values for screen percent width dimens am:
5fc6653ea7 am:
a58e208394 am:
1b39c88b97 am:
216352792e" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 9 Jun 2017 22:23:47 +0000 (22:23 +0000)]
Merge "Add missing values for screen percent width dimens am:
5fc6653ea7 am:
a58e208394 am:
1b39c88b97 am:
b9bcc1c66a" into oc-dr1-dev-plus-aosp
Todd Lee [Fri, 9 Jun 2017 22:23:04 +0000 (22:23 +0000)]
Add missing values for screen percent width dimens am:
5fc6653ea7 am:
a58e208394 am:
1b39c88b97
am:
216352792e
Change-Id: I510d5cd01b7c46ae24347b90154dbdbf09439545
Todd Lee [Fri, 9 Jun 2017 22:22:45 +0000 (22:22 +0000)]
Add missing values for screen percent width dimens am:
5fc6653ea7 am:
a58e208394 am:
1b39c88b97
am:
b9bcc1c66a
Change-Id: I4031c0127f4ac9ee87eeb9ae8106f343504085f6
Android Build Merger (Role) [Fri, 9 Jun 2017 22:22:36 +0000 (22:22 +0000)]
Merge "Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev am:
bc626c6358 am:
c1801c9a8d" into oc-dr1-dev-plus-aosp
Siyamed Sinir [Fri, 9 Jun 2017 22:20:48 +0000 (22:20 +0000)]
Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev am:
bc626c6358
am:
c1801c9a8d
Change-Id: Iac201ccb8123f114b492fbbe4c6a151b57f6dd27
Siyamed Sinir [Fri, 9 Jun 2017 22:20:15 +0000 (22:20 +0000)]
Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev am:
bc626c6358
am:
f99e84e4dd
Change-Id: I04a26678d8df05ea59bcec48061f027b0b567baf
Android Build Merger (Role) [Fri, 9 Jun 2017 22:17:09 +0000 (22:17 +0000)]
Merge "Merge "Protect autofill UI against redressing" into oc-dev am:
0541862ec5 am:
012c7d29d6" into oc-dr1-dev-plus-aosp
Svetoslav Ganov [Fri, 9 Jun 2017 22:15:07 +0000 (22:15 +0000)]
Merge "Protect autofill UI against redressing" into oc-dev am:
0541862ec5
am:
012c7d29d6
Change-Id: Ifbf4fd1083e9bb865fa3a20e5aedec43d1bf5eb5
Felipe Leme [Fri, 9 Jun 2017 22:13:59 +0000 (22:13 +0000)]
Merge "Minor fix on autofill() javadoc." into oc-dev
am:
211e760408
Change-Id: I1dddd4e6a326ccd0fb6f57dbd30b0c4ba0d08106
Svetoslav Ganov [Fri, 9 Jun 2017 22:13:37 +0000 (22:13 +0000)]
Merge "Protect autofill UI against redressing" into oc-dev am:
0541862ec5
am:
fa6b5ac317
Change-Id: Idca89686865f91cf2c3a0af895456e865ca4d90b
Android Build Merger (Role) [Fri, 9 Jun 2017 22:09:28 +0000 (22:09 +0000)]
Merge "Merge "Minor fix on autofill() javadoc." into oc-dev am:
211e760408" into oc-dev-plus-aosp
Lei Yu [Fri, 9 Jun 2017 22:08:39 +0000 (22:08 +0000)]
Merge changes from topic 'battery_smear_move' into oc-dev am:
883db32859
am:
308d0dd03c
Change-Id: Ifa87d06d51598b005a6f51d2bf3a2ac936848d6e
jackqdyulei [Fri, 9 Jun 2017 22:07:34 +0000 (22:07 +0000)]
Copy smearing method to BatteryStatsHelper am:
5dad8068e2
am:
5047d7bf7f -s ours
Change-Id: Ie76637f4bfc0bf23b5d74ba9688a03fba795cca5
Felipe Leme [Fri, 9 Jun 2017 22:07:19 +0000 (22:07 +0000)]
Merge "Minor fix on autofill() javadoc." into oc-dev
am:
211e760408
Change-Id: Iaea8691ad9d7ce3ff1936f966a780a801e508e1f
Hall Liu [Fri, 9 Jun 2017 22:06:22 +0000 (22:06 +0000)]
Merge "Update documentation for streaming methods" am:
186a588d57
am:
01604ebfc1
Change-Id: Ia7772c9f8b231af0cf48c50c09ec72fa38007df3
Felipe Leme [Fri, 9 Jun 2017 22:02:40 +0000 (22:02 +0000)]
Merge "Minor fix on autofill() javadoc." into oc-dev
Todd Lee [Fri, 9 Jun 2017 22:01:45 +0000 (22:01 +0000)]
Add missing values for screen percent width dimens am:
5fc6653ea7 am:
a58e208394
am:
1b39c88b97
Change-Id: I62c0a5776bf6307d8d9e580b7d5592352e2efdc8
Lei Yu [Fri, 9 Jun 2017 21:59:27 +0000 (21:59 +0000)]
Merge changes from topic 'battery_smear_move' into oc-dev am:
883db32859
am:
bd499f9319
Change-Id: I2add2be471c83285f104f137e45a9a8bbb2b8ce7
Hall Liu [Fri, 9 Jun 2017 21:58:50 +0000 (21:58 +0000)]
Merge "Update documentation for streaming methods"
am:
186a588d57
Change-Id: I44825b99a968b110bb23373d59aa0bb5ecaf7eac
jackqdyulei [Fri, 9 Jun 2017 21:58:06 +0000 (21:58 +0000)]
Copy smearing method to BatteryStatsHelper am:
5dad8068e2 -s ours
am:
6d1e7537f3 -s ours
Change-Id: Iac673806f829a216ce3f7222f9d94fd0aac7d371
Siyamed Sinir [Fri, 9 Jun 2017 21:56:09 +0000 (21:56 +0000)]
Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev
am:
bc626c6358
Change-Id: I4d3cff4bf6a0403f311011709c3074bca532de15
Svetoslav Ganov [Fri, 9 Jun 2017 21:49:49 +0000 (21:49 +0000)]
Merge "Protect autofill UI against redressing" into oc-dev
am:
0541862ec5
Change-Id: I07b91f8baa721b58f7f0ff9bf90a29481fdedaac
Hall Liu [Fri, 9 Jun 2017 21:44:27 +0000 (21:44 +0000)]
Merge "Update documentation for streaming methods"
Lei Yu [Fri, 9 Jun 2017 21:42:25 +0000 (21:42 +0000)]
Merge changes from topic 'battery_smear_move' into oc-dev
am:
883db32859
Change-Id: I45d4eaadbc992663b3453b52c391d5d4d660e046
jackqdyulei [Fri, 9 Jun 2017 21:41:14 +0000 (21:41 +0000)]
Copy smearing method to BatteryStatsHelper
am:
5dad8068e2 -s ours
Change-Id: I07d9a563f224d739e734af92ae5078d8c6f41100
Todd Lee [Fri, 9 Jun 2017 21:40:05 +0000 (21:40 +0000)]
Add missing values for screen percent width dimens am:
5fc6653ea7 am:
a58e208394
am:
1b39c88b97
Change-Id: Ib1de633f27978fd6b87606b44b45c3ac71bc2113
Siyamed Sinir [Fri, 9 Jun 2017 21:37:17 +0000 (21:37 +0000)]
Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev
am:
bc626c6358
Change-Id: I8688bda33124a78d439f1cbcf23926a0672b0735
Android Build Merger (Role) [Fri, 9 Jun 2017 21:32:14 +0000 (21:32 +0000)]
Merge "Merge "Closes Autofill UIs when back button is pressed." into oc-dev am:
8db148093c am:
6890569c04" into oc-dr1-dev-plus-aosp
Felipe Leme [Fri, 9 Jun 2017 21:28:01 +0000 (21:28 +0000)]
Merge "Closes Autofill UIs when back button is pressed." into oc-dev am:
8db148093c
am:
6890569c04
Change-Id: I8a2985107086b53b450137502e32f07dd5229f6c
Felipe Leme [Fri, 9 Jun 2017 21:27:48 +0000 (21:27 +0000)]
Merge "Closes Autofill UIs when back button is pressed." into oc-dev am:
8db148093c
am:
b32c05a36a
Change-Id: I69f9a67ae35a2f8e3ae9982531e391ea8a5b49e5
Svetoslav Ganov [Fri, 9 Jun 2017 21:25:58 +0000 (21:25 +0000)]
Merge "Protect autofill UI against redressing" into oc-dev
am:
0541862ec5
Change-Id: I0073d1eb75fc3460ad126ad08b9d4cf3f566a305
Felipe Leme [Fri, 9 Jun 2017 21:20:09 +0000 (21:20 +0000)]
Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev am:
e4835a2af4
am:
d66af648c2
Change-Id: I6317c298d0340cb283e5cdc9b7ec70a7d3fe8e8f
Lei Yu [Fri, 9 Jun 2017 21:17:14 +0000 (21:17 +0000)]
Merge changes from topic 'battery_smear_move' into oc-dev
am:
883db32859
Change-Id: Ibb862780286006efb4a4a117f007cc652dac4ce9
Todd Lee [Fri, 9 Jun 2017 21:16:04 +0000 (21:16 +0000)]
Add missing values for screen percent width dimens am:
5fc6653ea7
am:
a58e208394
Change-Id: I0bd6a5e8fe67439d823068229f4bbd828560d7c1
jackqdyulei [Fri, 9 Jun 2017 21:15:56 +0000 (21:15 +0000)]
Copy smearing method to BatteryStatsHelper
am:
5dad8068e2
Change-Id: I1a99fc38a665c3219999b464c1549dd707832f3d
Chen Xu [Fri, 9 Jun 2017 21:14:02 +0000 (21:14 +0000)]
Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev am:
cdec393aa3
am:
25c1a060bc
Change-Id: I2f400e951b3e1f7cc5fc1ac1548a09c3ae65da7b
Felipe Leme [Fri, 9 Jun 2017 21:12:03 +0000 (21:12 +0000)]
Merge "Closes Autofill UIs when back button is pressed." into oc-dev
am:
8db148093c
Change-Id: I966af17b26d67f7f29290ee73053e1b833a6623a
Lucas Dupin [Fri, 9 Jun 2017 21:10:33 +0000 (14:10 -0700)]
Removed test from presubmit.
testOnNotification_stillWorksAfterOneFailedProxCheck needs to
be ignored on presubmit runs. It fails on Tree Hugger but
runs locally.
Test: runtest systemui
Change-Id: Id4e1107528715c7e0b6ce7c69e2da7fa837e79a2
Android Build Merger (Role) [Fri, 9 Jun 2017 21:10:19 +0000 (21:10 +0000)]
Merge "Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev am:
e4835a2af4 am:
0425f9ceea" into oc-dr1-dev-plus-aosp
Felipe Leme [Fri, 9 Jun 2017 21:09:29 +0000 (21:09 +0000)]
Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev am:
e4835a2af4
am:
0425f9ceea
Change-Id: I3f817a83fcbda052ba3ca65fb539a7d77ec8d6a9
Android Build Merger (Role) [Fri, 9 Jun 2017 21:08:59 +0000 (21:08 +0000)]
Merge "Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev am:
cdec393aa3 am:
fce339c49c" into oc-dr1-dev-plus-aosp
Todd Lee [Fri, 9 Jun 2017 21:07:04 +0000 (21:07 +0000)]
Add missing values for screen percent width dimens
am:
5fc6653ea7
Change-Id: Icecf451c5cb97275234f75f55292729a5f213560
Chen Xu [Fri, 9 Jun 2017 21:06:48 +0000 (21:06 +0000)]
Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev am:
cdec393aa3
am:
fce339c49c
Change-Id: I1b2478820fbc282aa0448d1e1966f0cf81a2b207
Hemant Gupta [Fri, 9 Jun 2017 21:06:09 +0000 (21:06 +0000)]
OBEX: Add required parameters TAG ID's for PBAP 1.2 am:
6f2b75f574
am:
e2ac2e20d6
Change-Id: I4641c8bc03d0886d614165ac3c0fd42721c5a046
Felipe Leme [Fri, 9 Jun 2017 21:05:39 +0000 (21:05 +0000)]
Merge "Closes Autofill UIs when back button is pressed." into oc-dev
am:
8db148093c
Change-Id: I8f0bfb221b17804d3f9ec7b682ebd1256f53aa76
Felipe Leme [Fri, 9 Jun 2017 21:03:27 +0000 (21:03 +0000)]
Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev
am:
e4835a2af4
Change-Id: If88ec9c1de2d81d5b629ed0ead8c9911e6f2c0c5
Android Build Merger (Role) [Fri, 9 Jun 2017 21:02:45 +0000 (21:02 +0000)]
Merge "Merge "Add IApnSourceService.aidl" into oc-dr1-dev am:
49444fc090 -s ours" into oc-dr1-dev-plus-aosp
Chen Xu [Fri, 9 Jun 2017 21:00:26 +0000 (21:00 +0000)]
Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev
am:
cdec393aa3
Change-Id: I2e175c9a475d2cc2ad225154dbc5c2f855173975
Hemant Gupta [Fri, 9 Jun 2017 21:00:03 +0000 (21:00 +0000)]
OBEX: Add required parameters TAG ID's for PBAP 1.2 am:
6f2b75f574
am:
b99484cc61
Change-Id: I701377a315a73eb918f8e42129a401072733cb71
Jordan Liu [Fri, 9 Jun 2017 20:59:54 +0000 (20:59 +0000)]
Merge "Add IApnSourceService.aidl" into oc-dr1-dev
am:
49444fc090 -s ours
Change-Id: Id3b02a2cbcbcaa1bda5cf3515f9b33642afdb96d
Felipe Leme [Fri, 9 Jun 2017 20:59:53 +0000 (20:59 +0000)]
Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev
am:
e4835a2af4
Change-Id: I43a0e7bec7328d7a272c74145817bf4d9a03b69a
Siyamed Sinir [Fri, 9 Jun 2017 20:58:30 +0000 (20:58 +0000)]
Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev
Hemant Gupta [Fri, 9 Jun 2017 20:57:41 +0000 (20:57 +0000)]
OBEX: Add required parameters TAG ID's for PBAP 1.2
am:
6f2b75f574
Change-Id: I8dce42c762758a5ab2ca09b92301697af4d29a8a
Chen Xu [Fri, 9 Jun 2017 20:57:02 +0000 (20:57 +0000)]
Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev
am:
cdec393aa3
Change-Id: I657161b898c66efdf13c48c322e25cefc7733750
TreeHugger Robot [Fri, 9 Jun 2017 20:54:19 +0000 (20:54 +0000)]
Merge "Add IApnSourceService.aidl" into oc-dr1-dev
Svetoslav Ganov [Fri, 9 Jun 2017 20:53:26 +0000 (20:53 +0000)]
Merge "Protect autofill UI against redressing" into oc-dev
Lei Yu [Fri, 9 Jun 2017 20:50:36 +0000 (20:50 +0000)]
Merge changes from topic 'battery_smear_move' into oc-dev
* changes:
Batterystats logs smeared power model values
Copy smearing method to BatteryStatsHelper
Hemant Gupta [Fri, 9 Jun 2017 20:50:16 +0000 (20:50 +0000)]
OBEX: Add required parameters TAG ID's for PBAP 1.2
am:
6f2b75f574
Change-Id: I9110d7fd8b687f3ee59e3d9ea5ef3319873cdf69
Jeff Sharkey [Fri, 9 Jun 2017 20:29:11 +0000 (20:29 +0000)]
Merge "Omit icons from bulk SessionInfo calls." into oc-dr1-dev
am:
c017d299ce
Change-Id: I57a4f793614c12f32a5e0b8cafa98ef914f2501c
Jeff Sharkey [Fri, 9 Jun 2017 20:23:14 +0000 (20:23 +0000)]
Merge "Omit icons from bulk SessionInfo calls." into oc-dr1-dev
Dan Sandler [Fri, 9 Jun 2017 03:52:45 +0000 (23:52 -0400)]
🐙
It's convenient that this release is Android 8.
Bug:
32956843
Test: adb shell am start \
-a android.intent.action.MAIN \
-c com.android.internal.category.PLATLOGO
Change-Id: I9bb02b212fa241c17f03ef11c5c52dba0e6a746e
Felipe Leme [Fri, 9 Jun 2017 19:47:52 +0000 (19:47 +0000)]
Merge "Closes Autofill UIs when back button is pressed." into oc-dev
Felipe Leme [Fri, 9 Jun 2017 19:42:13 +0000 (19:42 +0000)]
Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev
Chen Xu [Fri, 9 Jun 2017 19:39:50 +0000 (19:39 +0000)]
Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev
Jorim Jaggi [Fri, 9 Jun 2017 19:00:58 +0000 (12:00 -0700)]
Fix thread booster
We need to conditionally set the prevPriority only if we enter
the first locked section. Otherwise we'll never reset back to the
lower priorities.
Test: Make sure no binder threads are stuck at 110.
Test: go/wm-smoke
Bug:
36631902
Change-Id: I8a9c329bc3084371022da91eabee45943c1b8c9f
Todd Lee [Wed, 3 May 2017 23:22:42 +0000 (16:22 -0700)]
Add missing values for screen percent width dimens
Protects against bootlooping in the event that developer
inadvertently changes DPI to unsupported value for device.
Use 0dp as it will not be mistaken for anything other
than a broken experience (cts test to validate device DPIs
so as to avoid shipping with this).
bug: b/
37755288
Change-Id: Ie9f4aa0d6d226383824e06d28151e06038d0110b
Jordan Liu [Fri, 9 Jun 2017 19:13:20 +0000 (19:13 +0000)]
Merge "Add IApnSourceService.aidl" am:
1d5d409f6f am:
7b78a176a9
am:
b699e98285
Change-Id: Ib0d3d447d6058cbc6e348f76e55429627a917591
Jordan Liu [Fri, 9 Jun 2017 19:04:48 +0000 (19:04 +0000)]
Merge "Add IApnSourceService.aidl" am:
1d5d409f6f
am:
7b78a176a9
Change-Id: I8fd54598aae183364ba44a0d5ca2f4331436292a
Hemant Gupta [Sat, 17 Oct 2015 14:10:53 +0000 (19:40 +0530)]
OBEX: Add required parameters TAG ID's for PBAP 1.2
Add required OBEX application parameters TAGID's and length
declarations required to support PBAP 1.2 specification.
Test: Connected with Remote PBAP Client supporting PBAP 1.2 and
verified that connection and transfer happens over L2CAP.
Connected with Remote PBAP Client supporting PBAP 1.1 and
and verified that connection and transfer happens over RFCOMM.
TestTracker: 89053
Bug:
33011817
Change-Id: I8a772b0dddf6ecf74b057e12d7596421c0e0f558
(cherry picked from commit
9e91b62c1fa4f6c51f53ddb3f2155f345be30a2a)
Android Build Merger (Role) [Fri, 9 Jun 2017 18:04:54 +0000 (18:04 +0000)]
Merge "Merge "Removing legacy default thumbnail logic." into oc-dev am:
a0e44e7335 am:
fc926a938e" into oc-dr1-dev-plus-aosp
Winson Chung [Fri, 9 Jun 2017 18:03:04 +0000 (18:03 +0000)]
Merge "Removing legacy default thumbnail logic." into oc-dev am:
a0e44e7335
am:
fc926a938e
Change-Id: I7a59633e9850083816c2dbdaffcc50b7908fa80d
Winson Chung [Fri, 9 Jun 2017 18:02:03 +0000 (18:02 +0000)]
Merge "Removing legacy default thumbnail logic." into oc-dev am:
a0e44e7335
am:
d6e3001770
Change-Id: I9b7572f08a3b67bf886aa06d02e00a960529aa9b
Winson Chung [Fri, 9 Jun 2017 17:56:26 +0000 (17:56 +0000)]
Merge "Removing legacy default thumbnail logic." into oc-dev
am:
a0e44e7335
Change-Id: I5bcc319b92c464c28ff4db6c94cf297e786b50d7
OSDN Git Service
