George Mount
d2cfff5781
Merge "Add target sdk check for behavior change." into oc-dev am: e5e246ce5c
...
am: 4e76728dea
Change-Id: Ia31e1eefe3771f5cc76b53112e01efdedfe55c58
2017-06-09 23:56:46 +00:00
George Mount
3e9429be6a
Merge "Add target sdk check for behavior change." into oc-dev am: e5e246ce5c
...
am: 62a18e12a3
Change-Id: I0c164eb98dd7265cdc67f107c3500f62dde7536a
2017-06-09 23:56:41 +00:00
George Mount
4e76728dea
Merge "Add target sdk check for behavior change." into oc-dev
...
am: e5e246ce5c
Change-Id: Ia06fe694f2afe55cd9560c2d6ae9112a6735cf93
2017-06-09 23:51:06 +00:00
Dianne Hackborn
729a328aca
Work on issue #62390590 : SecurityException in JobIntentService$...
...
...JobServiceEngineImpl$WrapperWorkItem.complete
Add more useful information in the security exception message that
is shown -- the reason the last job that was running on the context
was stopped. This should tell you why when you are calling at that
point your job is no longer running.
Test: bit CtsJobSchedulerTestCases:*
Change-Id: Ia7155248b4b4f032cbf8e8754c5437f658ed192c
2017-06-09 16:50:00 -07:00
George Mount
62a18e12a3
Merge "Add target sdk check for behavior change." into oc-dev
...
am: e5e246ce5c
Change-Id: I3734ee5cd46536a015a8fc60bf8b57818800c792
2017-06-09 23:49:21 +00:00
George Mount
e5e246ce5c
Merge "Add target sdk check for behavior change." into oc-dev
2017-06-09 23:41:47 +00:00
Android Build Merger (Role)
dc708c88c1
Merge "Merge "Fix thread booster" into oc-dev am: 4c1209e00e am: c48a8176e8" into oc-dr1-dev-plus-aosp
2017-06-09 23:39:46 +00:00
Jorim Jaggi
5d5b3583ff
Merge "Fix thread booster" into oc-dev am: 4c1209e00e
...
am: c48a8176e8
Change-Id: I30b49d87ad875b6a0bc30177959a2197cfc5a0b8
2017-06-09 23:38:50 +00:00
Jorim Jaggi
3ee99d75dd
Merge "Fix thread booster" into oc-dev am: 4c1209e00e
...
am: 2bdff7d64e
Change-Id: I3dc39403e74581946f90f0d9b21e981694e752ab
2017-06-09 23:37:22 +00:00
Android Build Merger (Role)
ac48ff1b2e
Merge "Merge "Removed test from presubmit." into oc-dev am: 4f30aa2be8 am: ed268dc350" into oc-dr1-dev-plus-aosp
2017-06-09 23:34:13 +00:00
Jorim Jaggi
c48a8176e8
Merge "Fix thread booster" into oc-dev
...
am: 4c1209e00e
Change-Id: I3ef8bce9cd703a630280595a47baebae12c28387
2017-06-09 23:33:16 +00:00
Lucas Dupin
fbcefcfb07
Merge "Removed test from presubmit." into oc-dev am: 4f30aa2be8
...
am: ed268dc350
Change-Id: I202bed758385f4918452d78dfef42682521132df
2017-06-09 23:33:16 +00:00
Lucas Dupin
1b005bbd5c
Merge "Removed test from presubmit." into oc-dev am: 4f30aa2be8
...
am: c9d11b7e83
Change-Id: I94a073c6151d19a40a5fea2db5871b6dc970de80
2017-06-09 23:31:01 +00:00
Jorim Jaggi
2bdff7d64e
Merge "Fix thread booster" into oc-dev
...
am: 4c1209e00e
Change-Id: Iea1b674cefc1d63eaeb77511904afcf4fdc7639e
2017-06-09 23:30:24 +00:00
Lucas Dupin
ed268dc350
Merge "Removed test from presubmit." into oc-dev
...
am: 4f30aa2be8
Change-Id: I3f73f3581fad4575f774f2c5ba870cc3308443a4
2017-06-09 23:26:36 +00:00
Jorim Jaggi
4c1209e00e
Merge "Fix thread booster" into oc-dev
2017-06-09 23:24:04 +00:00
Lucas Dupin
c9d11b7e83
Merge "Removed test from presubmit." into oc-dev
...
am: 4f30aa2be8
Change-Id: I49a803f8ecadfab53a686c91c601aaead8a1c81f
2017-06-09 23:23:20 +00:00
Hugo Benichi
4bf6322bcc
Merge "Instrument captive portal login activity" into oc-dr1-dev
...
am: 169f7bebce
Change-Id: I25f8400556ed82e32bbb7abd6e3fccd3df83cd5f
2017-06-09 23:23:17 +00:00
Felipe Leme
d52611258e
Removed deprecated setExtras() method.
...
Bug: 37563972
Test: CtsAutoFillServiceTestCases pass
Change-Id: I7fef7c81267dad9097c711dbba849adf9d6b1cc5
2017-06-09 16:19:58 -07:00
Hugo Benichi
169f7bebce
Merge "Instrument captive portal login activity" into oc-dr1-dev
2017-06-09 23:17:32 +00:00
TreeHugger Robot
4f30aa2be8
Merge "Removed test from presubmit." into oc-dev
2017-06-09 23:17:18 +00:00
Android Build Merger (Role)
07569ab051
Merge "Merge "" into oc-dev am: 0aaae4ae78 am: 770a4f20cc" into oc-dr1-dev-plus-aosp
2017-06-09 23:16:33 +00:00
Daniel Sandler
fbb92565d2
Merge "" into oc-dev am: 0aaae4ae78
...
am: 9bb81db15e
Change-Id: Ic0654fa608e873075938dd2b4ad5aaafd59cc2eb
2017-06-09 23:13:58 +00:00
Daniel Sandler
60811e41c6
Merge "" into oc-dev am: 0aaae4ae78
...
am: 770a4f20cc
Change-Id: Idc25cc03b6c6d9f2441b90487757dea1e795d48c
2017-06-09 23:13:57 +00:00
Daniel Sandler
9bb81db15e
Merge "" into oc-dev
...
am: 0aaae4ae78
Change-Id: Ibeceac21612da6669d0a216729c2671170651480
2017-06-09 23:05:29 +00:00
Daniel Sandler
770a4f20cc
Merge "" into oc-dev
...
am: 0aaae4ae78
Change-Id: Ic671cd9a8718509728f6058b8d8b695cefbdc0f3
2017-06-09 23:05:19 +00:00
Daniel Sandler
0aaae4ae78
Merge " 🐙 " into oc-dev
2017-06-09 22:55:49 +00:00
Android Build Merger (Role)
3d4ac192a1
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
2017-06-09 22:27:12 +00:00
Felipe Leme
f4e6754319
Merge "Merge "Minor fix on autofill() javadoc." into oc-dev am: 211e760408" into oc-dev-plus-aosp
...
am: c3f93e120c
Change-Id: Iaaf0f43a5d395110633c261e2f73025a284821b7
2017-06-09 22:26:02 +00:00
Android Build Merger (Role)
68f1f6dc94
Merge "Merge "Update documentation for streaming methods" am: 186a588d57 am: 01604ebfc1 am: cfbb73bcde" into oc-dr1-dev-plus-aosp
2017-06-09 22:25:38 +00:00
Android Build Merger (Role)
583ee227f5
Merge "Merge "Minor fix on autofill() javadoc." into oc-dev am: 211e760408 am: d11e14b428" into oc-dr1-dev-plus-aosp
2017-06-09 22:25:13 +00:00
Hall Liu
bebeade687
Merge "Update documentation for streaming methods" am: 186a588d57 am: 01604ebfc1
...
am: cfbb73bcde
Change-Id: Ib841554ba1ad15eceefcbb2ee32599e1087b9f76
2017-06-09 22:24:40 +00:00
Felipe Leme
151d390410
Merge "Minor fix on autofill() javadoc." into oc-dev am: 211e760408
...
am: d11e14b428
Change-Id: I80bd1592ca2b093e263f2ddfedc174dc401ec567
2017-06-09 22:24:17 +00:00
Android Build Merger (Role)
ca99123233
Merge "Add missing values for screen percent width dimens am: 5fc6653ea7 am: a58e208394 am: 1b39c88b97 am: 216352792e" into oc-dr1-dev-plus-aosp
2017-06-09 22:24:14 +00:00
Android Build Merger (Role)
62eece544d
Merge "Add missing values for screen percent width dimens am: 5fc6653ea7 am: a58e208394 am: 1b39c88b97 am: b9bcc1c66a" into oc-dr1-dev-plus-aosp
2017-06-09 22:23:54 +00:00
Todd Lee
31b5458f3a
Add missing values for screen percent width dimens am: 5fc6653ea7 am: a58e208394 am: 1b39c88b97
...
am: 216352792e
Change-Id: I510d5cd01b7c46ae24347b90154dbdbf09439545
2017-06-09 22:23:04 +00:00
Todd Lee
a8b60d253c
Add missing values for screen percent width dimens am: 5fc6653ea7 am: a58e208394 am: 1b39c88b97
...
am: b9bcc1c66a
Change-Id: I4031c0127f4ac9ee87eeb9ae8106f343504085f6
2017-06-09 22:22:45 +00:00
Android Build Merger (Role)
6ec22a12a0
Merge "Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev am: bc626c6358 am: c1801c9a8d" into oc-dr1-dev-plus-aosp
2017-06-09 22:22:42 +00:00
Siyamed Sinir
c8ac681d1d
Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev am: bc626c6358
...
am: c1801c9a8d
Change-Id: Iac201ccb8123f114b492fbbe4c6a151b57f6dd27
2017-06-09 22:20:48 +00:00
Siyamed Sinir
a02dcdcebc
Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev am: bc626c6358
...
am: f99e84e4dd
Change-Id: I04a26678d8df05ea59bcec48061f027b0b567baf
2017-06-09 22:20:15 +00:00
Android Build Merger (Role)
52c76834b4
Merge "Merge "Protect autofill UI against redressing" into oc-dev am: 0541862ec5 am: 012c7d29d6" into oc-dr1-dev-plus-aosp
2017-06-09 22:17:15 +00:00
Svetoslav Ganov
edf493c8bd
Merge "Protect autofill UI against redressing" into oc-dev am: 0541862ec5
...
am: 012c7d29d6
Change-Id: Ifbf4fd1083e9bb865fa3a20e5aedec43d1bf5eb5
2017-06-09 22:15:07 +00:00
Felipe Leme
d11e14b428
Merge "Minor fix on autofill() javadoc." into oc-dev
...
am: 211e760408
Change-Id: I1dddd4e6a326ccd0fb6f57dbd30b0c4ba0d08106
2017-06-09 22:13:59 +00:00
Svetoslav Ganov
984f1be505
Merge "Protect autofill UI against redressing" into oc-dev am: 0541862ec5
...
am: fa6b5ac317
Change-Id: Idca89686865f91cf2c3a0af895456e865ca4d90b
2017-06-09 22:13:37 +00:00
Android Build Merger (Role)
c3f93e120c
Merge "Merge "Minor fix on autofill() javadoc." into oc-dev am: 211e760408" into oc-dev-plus-aosp
2017-06-09 22:09:38 +00:00
Lei Yu
f15e4e77f6
Merge changes from topic 'battery_smear_move' into oc-dev am: 883db32859
...
am: 308d0dd03c
Change-Id: Ifa87d06d51598b005a6f51d2bf3a2ac936848d6e
2017-06-09 22:08:39 +00:00
jackqdyulei
289b74555f
Copy smearing method to BatteryStatsHelper am: 5dad8068e2
...
am: 5047d7bf7f -s ours
Change-Id: Ie76637f4bfc0bf23b5d74ba9688a03fba795cca5
2017-06-09 22:07:34 +00:00
Felipe Leme
0ba0e46215
Merge "Minor fix on autofill() javadoc." into oc-dev
...
am: 211e760408
Change-Id: Iaea8691ad9d7ce3ff1936f966a780a801e508e1f
2017-06-09 22:07:19 +00:00
Hall Liu
cfbb73bcde
Merge "Update documentation for streaming methods" am: 186a588d57
...
am: 01604ebfc1
Change-Id: Ia7772c9f8b231af0cf48c50c09ec72fa38007df3
2017-06-09 22:06:22 +00:00
Felipe Leme
211e760408
Merge "Minor fix on autofill() javadoc." into oc-dev
2017-06-09 22:02:51 +00:00