OSDN Git Service
Todd Kennedy [Fri, 19 Aug 2016 13:27:42 +0000 (13:27 +0000)]
Merge "Release mPackages lock earlier" into nyc-mr1-dev am:
42b14329f5
am:
d8f1599a6a
Change-Id: I9258c68915922344d5067ca1131441d19511c51a
Todd Kennedy [Fri, 19 Aug 2016 13:26:43 +0000 (13:26 +0000)]
Release mPackages lock earlier am:
a8d4f48997
am:
d8443b77cc
Change-Id: I26a23f47407dcb4d50fbfd9b70c1c023c36862a6
Todd Kennedy [Fri, 19 Aug 2016 13:17:54 +0000 (13:17 +0000)]
Merge "Release mPackages lock earlier" into nyc-mr1-dev
am:
42b14329f5
Change-Id: I7b6b45115d3ccdf4646395a59c6c572c22b70103
Todd Kennedy [Fri, 19 Aug 2016 13:17:51 +0000 (13:17 +0000)]
Release mPackages lock earlier
am:
a8d4f48997
Change-Id: I4c6a560fed34887eb67db728b4497b28931ae905
Scott Main [Fri, 19 Aug 2016 01:18:51 +0000 (01:18 +0000)]
Merge "fix redirect for AIDL doc bug:
5967288" into nyc-dev am:
66ffbbfdf9
am:
6e10a6c034
Change-Id: I13a891f0d36eb885dada3e0b52839a4f26255cd7
smain@google.com [Fri, 19 Aug 2016 01:18:49 +0000 (01:18 +0000)]
fix redirect for AIDL doc bug:
5967288 am:
9ad944f8c9
am:
a4b2c2889b
Change-Id: Ib860989f17257b6bf7bc440543a01cf00ef37afa
Scott Main [Fri, 19 Aug 2016 01:12:12 +0000 (01:12 +0000)]
Merge "fix redirect for AIDL doc bug:
5967288" into nyc-dev
am:
66ffbbfdf9
Change-Id: I9d9abedcd5721adbcfa4307794721a448bec80d4
smain@google.com [Fri, 19 Aug 2016 01:12:08 +0000 (01:12 +0000)]
fix redirect for AIDL doc bug:
5967288
am:
9ad944f8c9
Change-Id: I5a8bc81c442f54cce2a3b02e0a39e62a87f2d0d9
Scott Main [Fri, 19 Aug 2016 01:04:01 +0000 (01:04 +0000)]
Merge "fix redirect for AIDL doc bug:
5967288" into nyc-dev
TreeHugger Robot [Thu, 18 Aug 2016 23:16:01 +0000 (23:16 +0000)]
Merge "Release mPackages lock earlier" into nyc-mr1-dev
Ajay Panicker [Thu, 18 Aug 2016 22:42:18 +0000 (22:42 +0000)]
Merge "Protect various Bluetooth broadcasts" am:
53ff75bb68 am:
779a1f096c
am:
2bad652e56
Change-Id: I342864675beb5083d67c3d74993995936a9af326
George Mount [Thu, 18 Aug 2016 22:37:25 +0000 (22:37 +0000)]
Merge "Fix NPE during Activity transition using wrong Activity." into nyc-mr1-dev am:
2613fb543a
am:
a1006363d2
Change-Id: I6f530895662f5e39a4fffb932c4139de54fd5b59
George Mount [Thu, 18 Aug 2016 22:37:21 +0000 (22:37 +0000)]
Fix NPE during Activity transition using wrong Activity. am:
a3edbf6a5d
am:
34abaebd3b
Change-Id: Ia21fab56d6ca3767d270e5336334dfb1e066bf5f
Andy Hung [Thu, 18 Aug 2016 22:37:16 +0000 (22:37 +0000)]
Merge "AudioSystem: Verify audio port array information" into nyc-mr1-dev am:
47c7a8c19a
am:
4b1d87eca6
Change-Id: Ia89aa1418f704935ac2364462634070ffab80e25
Andy Hung [Thu, 18 Aug 2016 22:37:12 +0000 (22:37 +0000)]
AudioSystem: Verify audio port array information am:
737d9fb181
am:
79d51bf46e
Change-Id: Ie74dc2cc9e8f8f9fca143f7cb83acec2b8af669b
Ajay Panicker [Thu, 18 Aug 2016 22:37:06 +0000 (22:37 +0000)]
Merge "Protect various Bluetooth broadcasts" am:
53ff75bb68
am:
779a1f096c
Change-Id: I979b7fcabc7e1f4714a88a632d3590304e1fb4fb
George Mount [Thu, 18 Aug 2016 22:32:14 +0000 (22:32 +0000)]
Merge "Fix NPE during Activity transition using wrong Activity." into nyc-mr1-dev
am:
2613fb543a
Change-Id: I82e061d321a935aed4ec9334b51c16d713991d67
Ajay Panicker [Thu, 18 Aug 2016 22:32:09 +0000 (22:32 +0000)]
Merge "Protect various Bluetooth broadcasts"
am:
53ff75bb68
Change-Id: Id4f77ea2092f9a04397fe596ed92f2f30a3235df
George Mount [Thu, 18 Aug 2016 22:32:08 +0000 (22:32 +0000)]
Fix NPE during Activity transition using wrong Activity.
am:
a3edbf6a5d
Change-Id: Ie6ca8f9f9f251eaf844f842e0f6f0ab36a975c1e
Andy Hung [Thu, 18 Aug 2016 22:32:00 +0000 (22:32 +0000)]
Merge "AudioSystem: Verify audio port array information" into nyc-mr1-dev
am:
47c7a8c19a
Change-Id: I8cb76567c8de112d4ac11fbdeaf8880b7ec7c7f9
Andy Hung [Thu, 18 Aug 2016 22:31:53 +0000 (22:31 +0000)]
AudioSystem: Verify audio port array information
am:
737d9fb181
Change-Id: I7a9eeeac4e0f02b4e045b7f277666bd4d3866441
George Mount [Thu, 18 Aug 2016 22:27:27 +0000 (22:27 +0000)]
Merge "Fix NPE during Activity transition using wrong Activity." into nyc-mr1-dev
Treehugger Robot [Thu, 18 Aug 2016 22:25:39 +0000 (22:25 +0000)]
Merge "Protect various Bluetooth broadcasts"
Andy Hung [Thu, 18 Aug 2016 22:25:17 +0000 (22:25 +0000)]
Merge "AudioSystem: Verify audio port array information" into nyc-mr1-dev
smain@google.com [Thu, 18 Aug 2016 21:41:47 +0000 (14:41 -0700)]
fix redirect for AIDL doc
bug:
5967288
Change-Id: Ia2a4cbdde56d2e6baca4c5f74ea92bb7bfaf2938
Ajay Panicker [Wed, 17 Aug 2016 22:36:24 +0000 (15:36 -0700)]
Protect various Bluetooth broadcasts
Bug:
30832954
Change-Id: I37e0b2ffab65c0703244917a4ade9bb8afbb5e6f
(cherry picked from commit
9a236066dbf604edfd5f873b4a3b94a200efd628)
Tim Murray [Thu, 18 Aug 2016 20:41:01 +0000 (20:41 +0000)]
Merge "Prevent FIFO threads from creating more FIFO threads." into nyc-mr1-dev am:
bb4e37c602
am:
6e23e43d54
Change-Id: Ibe675c0aebe95273ff12e2833b6668e0d3bc4bfa
Tim Murray [Thu, 18 Aug 2016 20:35:12 +0000 (20:35 +0000)]
Prevent FIFO threads from creating more FIFO threads. am:
38ee337f45
am:
0ceda0c956
Change-Id: I71d40b4e0a8716cf1c1af5339de31d7edf744e43
Tim Murray [Thu, 18 Aug 2016 20:31:00 +0000 (20:31 +0000)]
Merge "Prevent FIFO threads from creating more FIFO threads." into nyc-mr1-dev
am:
bb4e37c602
Change-Id: Iea2f53fb8a62d3c59a10ca352a8485cd4d0ee326
Tim Murray [Thu, 18 Aug 2016 20:30:58 +0000 (20:30 +0000)]
Prevent FIFO threads from creating more FIFO threads.
am:
38ee337f45
Change-Id: Iecd7619faae5195934335afc0048cc5ddb6b9ab7
Tim Murray [Thu, 18 Aug 2016 20:25:36 +0000 (20:25 +0000)]
Merge "Prevent FIFO threads from creating more FIFO threads." into nyc-mr1-dev
Svetoslav Ganov [Thu, 18 Aug 2016 19:22:28 +0000 (19:22 +0000)]
Merge "Grab lock when accessing mutable state" into nyc-mr1-dev am:
6642c963d9
am:
decad179f6
Change-Id: Ie4c013991ea3a57009926973441adcbeec38d56f
Svet Ganov [Thu, 18 Aug 2016 19:22:24 +0000 (19:22 +0000)]
Grab lock when accessing mutable state am:
442ed57e4b
am:
e1790d928f
Change-Id: If7d7e4f80f01b112d7a24993d28746c71ec85a17
Svetoslav Ganov [Thu, 18 Aug 2016 19:12:54 +0000 (19:12 +0000)]
Merge "Grab lock when accessing mutable state" into nyc-mr1-dev
am:
6642c963d9
Change-Id: Ibe00e1f3bdf916129355a38beece5378ec379a78
Svet Ganov [Thu, 18 Aug 2016 19:12:50 +0000 (19:12 +0000)]
Grab lock when accessing mutable state
am:
442ed57e4b
Change-Id: Ic8610ed5f0584150d7cda88761bff69dca8d1b42
Svetoslav Ganov [Thu, 18 Aug 2016 19:05:47 +0000 (19:05 +0000)]
Merge "Grab lock when accessing mutable state" into nyc-mr1-dev
Ajay Panicker [Thu, 18 Aug 2016 18:46:50 +0000 (18:46 +0000)]
Protect various Bluetooth broadcasts am:
9a236066db
am:
003342e425
Change-Id: I854cce48aee3ec723ed520dd40af068d0907e11a
Ajay Panicker [Thu, 18 Aug 2016 18:40:25 +0000 (18:40 +0000)]
Protect various Bluetooth broadcasts
am:
9a236066db
Change-Id: I71a84c8486b70d6b94e9656a8a1299a9796d0d52
Todd Kennedy [Thu, 18 Aug 2016 18:22:52 +0000 (11:22 -0700)]
Release mPackages lock earlier
We cannot hold mPackages when calling into generatePackageDexopts().
This method takes Package Manager's mInstallLock. By holding mPackages,
we have lock inversion and hilarity ensues.
Change-Id: Ia11a158677051e3511702f38cde6780e75b256fb
Fixes:
30927731
Tim Murray [Thu, 18 Aug 2016 18:13:26 +0000 (11:13 -0700)]
Prevent FIFO threads from creating more FIFO threads.
SCHED_FIFO threads shouldn't be able to arbitrarily create more
SCHED_FIFO threads.
bug
30898724
Change-Id: I3704b47b88b573313e9b1610556648c8595d4108
George Mount [Tue, 16 Aug 2016 20:10:19 +0000 (13:10 -0700)]
Fix NPE during Activity transition using wrong Activity.
Bug
30786309
If the Activity used in makeSceneTransitionAnimation isn't
the same one used in the startActivity call, a NullPointerException
could be thrown.
Change-Id: Id21c54fcf99b353feab62f7fc160997ed06e7d23
(cherry picked from commit
3289bfa289f560d60611dddef9441c9614fd883a)
Ajay Panicker [Wed, 17 Aug 2016 22:36:24 +0000 (15:36 -0700)]
Protect various Bluetooth broadcasts
Bug:
30832954
Change-Id: I37e0b2ffab65c0703244917a4ade9bb8afbb5e6f
Narayan Kamath [Thu, 18 Aug 2016 10:33:08 +0000 (10:33 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev am:
cce8af824a am:
e24a4590bf
am:
9988387315
Change-Id: I3d231654ed3c6264087f5b3a953f5e27d2c3d5ed
Narayan Kamath [Thu, 18 Aug 2016 10:32:57 +0000 (10:32 +0000)]
Process: Fix communication with zygote. am:
448be0a622 am:
ac16712d8a
am:
b9871c0dd3
Change-Id: I1fefed1f81ed0033ababf0847923a689a3ee4b5c
Narayan Kamath [Thu, 18 Aug 2016 10:25:56 +0000 (10:25 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev am:
cce8af824a
am:
480f4a932e
Change-Id: Ibf3184b0e02c5b77d1fec5d8c2e2bcefe7100c3d
Narayan Kamath [Thu, 18 Aug 2016 10:25:53 +0000 (10:25 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev am:
cce8af824a
am:
e24a4590bf
Change-Id: I933fe1f6f191e669a7a6ed4d00660a01f95feade
Narayan Kamath [Thu, 18 Aug 2016 10:25:53 +0000 (10:25 +0000)]
Process: Fix communication with zygote. am:
448be0a622
am:
6bc7670c67
Change-Id: I37ea2a3324277340fce69fcc6a5101bee0637dca
Narayan Kamath [Thu, 18 Aug 2016 10:25:51 +0000 (10:25 +0000)]
Process: Fix communication with zygote. am:
448be0a622
am:
ac16712d8a
Change-Id: Ief10a90dc77fa8e5cd562a39a6ddbad059353fdf
Narayan Kamath [Thu, 18 Aug 2016 10:20:01 +0000 (10:20 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev
am:
cce8af824a
Change-Id: I728529bd6e54b7e1e220b62f6c84dc5e868d5ecc
Narayan Kamath [Thu, 18 Aug 2016 10:20:00 +0000 (10:20 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev
am:
cce8af824a
Change-Id: I1086785cde9f5d9bbdff84b225c4d20582977c75
Narayan Kamath [Thu, 18 Aug 2016 10:19:58 +0000 (10:19 +0000)]
Process: Fix communication with zygote.
am:
448be0a622
Change-Id: Iabb68084827f798f25ebe870957074d152acaea4
Narayan Kamath [Thu, 18 Aug 2016 10:19:57 +0000 (10:19 +0000)]
Process: Fix communication with zygote.
am:
448be0a622
Change-Id: I5d496613f53c339c75a3293845670d9d8360c90f
Narayan Kamath [Thu, 18 Aug 2016 10:14:29 +0000 (10:14 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev
Dmitriy Filchenko [Thu, 18 Aug 2016 03:33:20 +0000 (03:33 +0000)]
Merge "Remove unused includes." am:
35da832634 am:
33e65232f3
am:
eb349448aa
Change-Id: Ib07d472af12852399a80d5a6503c1c34a6c9380c
Dmitriy Filchenko [Thu, 18 Aug 2016 03:27:54 +0000 (03:27 +0000)]
Merge "Remove unused includes." am:
35da832634
am:
33e65232f3
Change-Id: I72e74566ed21f4aed4b2d6b4fa6e7ac1114a9f43
Dmitriy Filchenko [Thu, 18 Aug 2016 03:22:39 +0000 (03:22 +0000)]
Merge "Remove unused includes."
am:
35da832634
Change-Id: I5804c0ccf6c543471ddf3245a799d5fa651d6d18
Treehugger Robot [Thu, 18 Aug 2016 03:17:04 +0000 (03:17 +0000)]
Merge "Remove unused includes."
Dmitriy Filchenko [Thu, 18 Aug 2016 00:55:24 +0000 (17:55 -0700)]
Remove unused includes.
BUG:
29824203
Change-Id: I795f8abe31575f70da263921c6ec13b73b24dc7b
Bill Yi [Thu, 18 Aug 2016 01:32:21 +0000 (01:32 +0000)]
Import translations. DO NOT MERGE am:
9d652db6a4 -s ours
am:
b024dd7501 -s ours
Change-Id: Id17a8898db1aaf4230d66d062884d0ac4b5d391f
Adam Lesinski [Thu, 18 Aug 2016 01:32:06 +0000 (01:32 +0000)]
Merge "AppIdleHistory: Only write screen on durations during regular sync" into nyc-mr1-dev am:
1af694510d
am:
6d90bbbc6c
Change-Id: I11da4168a11265690e27c00498f94eac363e4b64
Bill Yi [Thu, 18 Aug 2016 01:28:19 +0000 (01:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
4b30053ede -s ours
Change-Id: I28c7df17b56064d5d267de60a0821ebd409b910b
Bill Yi [Thu, 18 Aug 2016 01:28:18 +0000 (01:28 +0000)]
Import translations. DO NOT MERGE
am:
9d652db6a4 -s ours
Change-Id: If56739a9258c72a95dd7be524dd3b5c21bfd34ed
Adam Lesinski [Thu, 18 Aug 2016 01:27:52 +0000 (01:27 +0000)]
Merge "AppIdleHistory: Only write screen on durations during regular sync" into nyc-mr1-dev am:
1af694510d
am:
65a12c15e7
Change-Id: Ide64632d5351a5405f6ab98c09f16311fe71c821
Adam Lesinski [Thu, 18 Aug 2016 01:27:49 +0000 (01:27 +0000)]
AppIdleHistory: Only write screen on durations during regular sync am:
f2d87eba75
am:
a61092650c
Change-Id: Idb45fe9639dc8d81730a2c6c5c752d10d3fbb1e1
TreeHugger Robot [Thu, 18 Aug 2016 01:23:04 +0000 (01:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Adam Lesinski [Thu, 18 Aug 2016 01:19:56 +0000 (01:19 +0000)]
Merge "AppIdleHistory: Only write screen on durations during regular sync" into nyc-mr1-dev
am:
1af694510d
Change-Id: I60d96424e94226a85ef9fe79aba571b2329ee96e
Adam Lesinski [Thu, 18 Aug 2016 01:19:51 +0000 (01:19 +0000)]
AppIdleHistory: Only write screen on durations during regular sync
am:
f2d87eba75
Change-Id: I7e5a6d89afa813fdb68c68d201ad04971641dabd
TreeHugger Robot [Thu, 18 Aug 2016 01:14:31 +0000 (01:14 +0000)]
Merge "AppIdleHistory: Only write screen on durations during regular sync" into nyc-mr1-dev
Andy Hung [Wed, 17 Aug 2016 01:38:49 +0000 (18:38 -0700)]
AudioSystem: Verify audio port array information
Bug:
30737845
Change-Id: Id092086862bc527fccc5e9f34c8a3ab16167ae92
Svet Ganov [Thu, 18 Aug 2016 00:29:43 +0000 (17:29 -0700)]
Grab lock when accessing mutable state
bug:
30881375
Change-Id: Ied52fd9666f28b5c2038144b85cd74480ccfde43
Adam Lesinski [Wed, 17 Aug 2016 22:21:16 +0000 (15:21 -0700)]
AppIdleHistory: Only write screen on durations during regular sync
Stop writing to disk every time the display goes off. Only write to
disk periodically.
Consequences
Previously, if the device rebooted after the screen duration was written
to disk, apps would appear more stale than they actually were.
Now apps will always look fresher, which is a better scenario.
Bug:
30807864
Change-Id: Ia69a2e51fc9e397789215b449fae56fa3e29c74a
Jim Miller [Wed, 17 Aug 2016 23:38:40 +0000 (23:38 +0000)]
Fix vulnerability in LockSettings service am:
2d71384a13 am:
485fbda04c am:
229de7088e am:
cb83f6188b am:
e3457fc127 am:
669a153531
am:
6314ac7c30
Change-Id: Ic7159f05071eed128971db27f6789e66d8691e20
Jim Miller [Wed, 17 Aug 2016 23:36:28 +0000 (23:36 +0000)]
Fix vulnerability in LockSettings service am:
2d71384a13 am:
485fbda04c am:
229de7088e am:
cb83f6188b am:
e3457fc127
am:
7329e02153
Change-Id: I1dadbc10574e60565d0e30d2ba9e26bc352ebf10
Jim Miller [Wed, 17 Aug 2016 23:33:13 +0000 (23:33 +0000)]
Fix vulnerability in LockSettings service am:
2d71384a13 am:
485fbda04c am:
229de7088e am:
cb83f6188b am:
e3457fc127
am:
669a153531
Change-Id: Ia8a9962fdbf010066b6fd72ed4ccdc35548571f9
Jim Miller [Wed, 17 Aug 2016 23:31:06 +0000 (23:31 +0000)]
Fix vulnerability in LockSettings service am:
2d71384a13 am:
485fbda04c am:
229de7088e am:
cb83f6188b
am:
e3457fc127
Change-Id: I9ec3cc802112160f463fcfb737c6fd5932d62332
Dirk Dougherty [Wed, 17 Aug 2016 23:30:30 +0000 (23:30 +0000)]
Merge "dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links." into nyc-dev am:
96855c49a6
am:
ac2c1dde2d
Change-Id: If830d651527fb14a2cf3376a52befb3f15ba93fe
Dirk Dougherty [Wed, 17 Aug 2016 23:30:19 +0000 (23:30 +0000)]
dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links. am:
b042ab1eb6
am:
1d7e5a6998
Change-Id: I6920f244862bcdb50e5d5a47cc1bfa711764dbe1
Jim Miller [Wed, 17 Aug 2016 23:26:57 +0000 (23:26 +0000)]
Fix vulnerability in LockSettings service am:
2d71384a13 am:
485fbda04c am:
229de7088e am:
cb83f6188b
am:
e3457fc127
Change-Id: I1bc40c141498e62cad36acc9568177cb88debc11
Dirk Dougherty [Wed, 17 Aug 2016 23:25:42 +0000 (23:25 +0000)]
Merge "dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links." into nyc-dev
am:
96855c49a6
Change-Id: If3b5e4b033c0038bddaf873108406c9374979c06
Dirk Dougherty [Wed, 17 Aug 2016 23:25:38 +0000 (23:25 +0000)]
dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links.
am:
b042ab1eb6
Change-Id: I1c8026a7ff09cfce9049383123a143b845dcede6
Jim Miller [Wed, 17 Aug 2016 23:22:33 +0000 (23:22 +0000)]
Fix vulnerability in LockSettings service am:
2d71384a13 am:
485fbda04c am:
229de7088e
am:
cb83f6188b
Change-Id: I82302931ab714e25ec21721dc05480e1f2d447b0
Dirk Dougherty [Wed, 17 Aug 2016 23:16:07 +0000 (23:16 +0000)]
Merge "dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links." into nyc-dev am:
96855c49a6 am:
4fa4b29890
am:
f6a3029304
Change-Id: I3477f3303a586775e7a55eb9fda6f857eefbb588
Dirk Dougherty [Wed, 17 Aug 2016 23:16:03 +0000 (23:16 +0000)]
dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links. am:
b042ab1eb6 am:
d66ec65b77
am:
7e7ea76356
Change-Id: I6a9043c277e624dd3c96be9122454c937931b461
Jim Miller [Wed, 17 Aug 2016 23:15:43 +0000 (23:15 +0000)]
Fix vulnerability in LockSettings service am:
2d71384a13 am:
485fbda04c
am:
229de7088e
Change-Id: I8e9d946f96933c1338261d8adf80156cb67d3ba1
Dirk Dougherty [Wed, 17 Aug 2016 23:08:17 +0000 (23:08 +0000)]
Merge "dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links." into nyc-dev am:
96855c49a6
am:
4fa4b29890
Change-Id: Id9260b2dc3be5840d3322ea7d5a6f90d0e62e117
Dirk Dougherty [Wed, 17 Aug 2016 23:08:15 +0000 (23:08 +0000)]
dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links. am:
b042ab1eb6
am:
d66ec65b77
Change-Id: If34b51e4685f18a066dc21c794a88f7d4d03bc22
Jim Miller [Wed, 17 Aug 2016 23:07:46 +0000 (23:07 +0000)]
Fix vulnerability in LockSettings service am:
2d71384a13
am:
485fbda04c
Change-Id: I07def32199ecdbbb32aa6ecaca20724cfc81265c
Dirk Dougherty [Wed, 17 Aug 2016 22:59:31 +0000 (22:59 +0000)]
Merge "dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links." into nyc-dev
am:
96855c49a6
Change-Id: If07272ee0de59b546df04f0232219bb0954da582
Jim Miller [Wed, 17 Aug 2016 22:59:27 +0000 (22:59 +0000)]
Fix vulnerability in LockSettings service
am:
2d71384a13
Change-Id: I62ca5fb150022fe0971329294b1063957f397248
Dirk Dougherty [Wed, 17 Aug 2016 22:59:23 +0000 (22:59 +0000)]
dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links.
am:
b042ab1eb6
Change-Id: I725ff3bce89572d06f76dd9f1860365514d27d56
Dirk Dougherty [Wed, 17 Aug 2016 22:53:23 +0000 (22:53 +0000)]
Merge "dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links." into nyc-dev
Bill Yi [Wed, 17 Aug 2016 22:33:39 +0000 (15:33 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
30362824
Change-Id: I319b881d2a02816d932688c70c61f4ad2b315ef8
Narayan Kamath [Wed, 17 Aug 2016 22:17:08 +0000 (22:17 +0000)]
Merge "BackgroundDexOptService: Check for low storage conditions." into nyc-mr1-dev am:
712dde29ff
am:
aa7d06a93f
Change-Id: I4195624058c76cf2031fa59b44bf98b2dab0f9aa
Narayan Kamath [Wed, 17 Aug 2016 22:17:04 +0000 (22:17 +0000)]
BackgroundDexOptService: Check for low storage conditions. am:
8735f07a69
am:
e16463c3f7
Change-Id: Ief544e326a0eb32e789041c9b7014a1172ae2fa5
Narayan Kamath [Wed, 17 Aug 2016 22:11:13 +0000 (22:11 +0000)]
Merge "BackgroundDexOptService: Check for low storage conditions." into nyc-mr1-dev
am:
712dde29ff
Change-Id: I717fe1f5cbc7ca19044325a65721bdb389a38097
Narayan Kamath [Wed, 17 Aug 2016 22:11:09 +0000 (22:11 +0000)]
BackgroundDexOptService: Check for low storage conditions.
am:
8735f07a69
Change-Id: Iec5fc8bf8291f7ed04ebeda26190f498b555069d
TreeHugger Robot [Wed, 17 Aug 2016 22:07:12 +0000 (22:07 +0000)]
Merge "BackgroundDexOptService: Check for low storage conditions." into nyc-mr1-dev
Adam Lesinski [Wed, 17 Aug 2016 21:56:38 +0000 (21:56 +0000)]
Merge "AAPT: Handle gaps in resources when building splits" into nyc-mr1-dev am:
c1a36814e5
am:
dcd8f86b19
Change-Id: Ia1cd4e6434a8ecb33e9b36c7f8f430711426190a
Adam Lesinski [Wed, 17 Aug 2016 21:56:34 +0000 (21:56 +0000)]
AAPT: Handle gaps in resources when building splits am:
26ae640c34
am:
2c8aa38e7a
Change-Id: I475c971fabb2b4bf5acb4f0e9a86d95d79a650ed
Adam Lesinski [Wed, 17 Aug 2016 21:51:15 +0000 (21:51 +0000)]
Merge "AAPT: Handle gaps in resources when building splits" into nyc-mr1-dev
am:
c1a36814e5
Change-Id: I67ad7adede8463fe3f670af949e9c3a4dc438c27