OSDN Git Service
Teng-Hui Zhu [Wed, 7 Dec 2016 21:14:37 +0000 (21:14 +0000)]
Recreate the bitmap cache when it is smaller than needed am:
17f40b80f6
am:
4c6edb0a3c -s ours
Change-Id: Iab3b1805fa431ae41323a0476576edf77f1edb8f
TreeHugger Robot [Wed, 7 Dec 2016 21:04:30 +0000 (21:04 +0000)]
Merge "Add proto fields for READ_PHONE_NUMBER"
Mike Reed [Wed, 7 Dec 2016 20:54:55 +0000 (20:54 +0000)]
Merge "switch over clip calls to use SkClipOp instead of SkRegion::Op"
Lei Yu [Wed, 7 Dec 2016 20:47:04 +0000 (20:47 +0000)]
Merge "Add tint for cast icon"
Lei Yu [Wed, 7 Dec 2016 20:44:41 +0000 (20:44 +0000)]
Merge "Add tint for wifi icon."
Lei Yu [Wed, 7 Dec 2016 20:43:53 +0000 (20:43 +0000)]
Merge "Add tint for night display icon"
Lei Yu [Wed, 7 Dec 2016 20:39:53 +0000 (20:39 +0000)]
Merge "Add tint for bluebooth icon"
Lei Yu [Wed, 7 Dec 2016 20:39:14 +0000 (20:39 +0000)]
Merge "Add tint for location icon"
Lei Yu [Wed, 7 Dec 2016 20:38:34 +0000 (20:38 +0000)]
Merge "Add tint for rotate icon"
Lei Yu [Wed, 7 Dec 2016 20:37:55 +0000 (20:37 +0000)]
Merge "Add tint for dnd icon"
Lei Yu [Wed, 7 Dec 2016 20:37:13 +0000 (20:37 +0000)]
Merge "Add tint for invert color icon"
Lei Yu [Wed, 7 Dec 2016 20:36:05 +0000 (20:36 +0000)]
Merge "Add tint for brightness thumb icon"
Lei Yu [Wed, 7 Dec 2016 20:35:28 +0000 (20:35 +0000)]
Merge "Add tint for flashlight icon"
Matthew Fritze [Wed, 7 Dec 2016 19:37:39 +0000 (19:37 +0000)]
Merge "Update SearchIndexablesContract"
Jeff Sharkey [Wed, 7 Dec 2016 19:31:49 +0000 (19:31 +0000)]
Merge "Fix two StrictMode stack collection bugs." into nyc-mr2-dev am:
ae91d10629
am:
b7b3086dd5
Change-Id: I4a2abf9712db91a533e21cd859fe53c94804566f
Android Build Merger (Role) [Wed, 7 Dec 2016 19:29:00 +0000 (19:29 +0000)]
Merge "Fix two StrictMode stack collection bugs. am:
20db11cfda am:
1804995d7e -s ours"
Jeff Sharkey [Wed, 7 Dec 2016 19:28:19 +0000 (19:28 +0000)]
Fix two StrictMode stack collection bugs. am:
20db11cfda
am:
1804995d7e -s ours
Change-Id: Ic35d40b47457b253a8ab33d16d6cf077bacdbc32
Sudheer Shanka [Wed, 7 Dec 2016 19:27:28 +0000 (19:27 +0000)]
Merge "Update IActivityManager, ContentProviderHolder in preloaded-classes."
Chad Brubaker [Tue, 6 Dec 2016 20:31:15 +0000 (12:31 -0800)]
Add proto fields for READ_PHONE_NUMBER
Test: m
Change-Id: Ifc8c9eed3af6baa405714cda664cc9dc60969cb9
Teng-Hui Zhu [Wed, 7 Dec 2016 18:59:58 +0000 (18:59 +0000)]
Recreate the bitmap cache when it is smaller than needed
am:
17f40b80f6
Change-Id: I057156b0f70c89ef1cd4b89237dc0c3b2146d0fa
Jeff Sharkey [Wed, 7 Dec 2016 18:44:35 +0000 (18:44 +0000)]
Merge "Fix two StrictMode stack collection bugs." into nyc-mr2-dev
am:
ae91d10629
Change-Id: I48fc80601af3296f80134ede1c0b6cfc8fcd98b5
Jeff Sharkey [Wed, 7 Dec 2016 18:44:28 +0000 (18:44 +0000)]
Fix two StrictMode stack collection bugs.
am:
20db11cfda
Change-Id: Ie68764c9864e1c26f43c9d70c5697fe12d00e665
TreeHugger Robot [Wed, 7 Dec 2016 18:39:00 +0000 (18:39 +0000)]
Merge "Fix two StrictMode stack collection bugs." into nyc-mr2-dev
Mahaver Chopra [Wed, 7 Dec 2016 18:35:00 +0000 (18:35 +0000)]
Merge "TRON variables for provisioning sessions"
Derek Sollenberger [Wed, 7 Dec 2016 18:10:16 +0000 (18:10 +0000)]
Merge "SkImageEncoder->SkEncodeImage"
Mark Renouf [Wed, 7 Dec 2016 17:39:21 +0000 (17:39 +0000)]
Merge "Revert "Allow power button to close an input method"" into nyc-mr2-dev am:
6e5ff8a87d
am:
4566d01f67
Change-Id: Ibb37c82924fdc61a00c8963568a8e9422ebfe173
Mark Renouf [Wed, 7 Dec 2016 17:38:13 +0000 (17:38 +0000)]
Revert "Allow power button to close an input method" am:
28f0e5bf48
am:
fc526f6e84
Change-Id: Ifcf2f842c91677128e458dd7256013263543937f
Mark Renouf [Wed, 7 Dec 2016 17:29:33 +0000 (17:29 +0000)]
Merge "Revert "Allow power button to close an input method"" into nyc-mr2-dev
am:
6e5ff8a87d
Change-Id: I7db082275a2a85229a7cc4014d580e9997cac82d
Mark Renouf [Wed, 7 Dec 2016 17:29:25 +0000 (17:29 +0000)]
Revert "Allow power button to close an input method"
am:
28f0e5bf48
Change-Id: I678857531259617cc26941fcc832cb7670d25bfe
Matthew Fritze [Tue, 6 Dec 2016 02:13:46 +0000 (18:13 -0800)]
Update SearchIndexablesContract
Add Payload and PayloadType to the SearhIndexablesContract to support
the new Search architecture in Settings Search.
Change-Id: I07e411ead11d420c19c737fad79d459f44288681
Test: SettingsUnitTests
Bug:
33390556
TreeHugger Robot [Wed, 7 Dec 2016 17:22:56 +0000 (17:22 +0000)]
Merge "Revert "Allow power button to close an input method"" into nyc-mr2-dev
Paul Duffin [Wed, 7 Dec 2016 17:12:16 +0000 (17:12 +0000)]
Merge "Merge "Add legacy-performance-test-hostdex target" am:
f9587a35ba am:
c5f2b08e83 am:
ef1d2b970c" into nyc-mr2-dev-plus-aosp
am:
4ad5bd10cb
Change-Id: Iad52523da7f43fe5eee84b52d128042c7cd1a466
Paul Duffin [Wed, 7 Dec 2016 17:12:07 +0000 (17:12 +0000)]
Merge "Add legacy-performance-test-hostdex target" am:
f9587a35ba am:
c5f2b08e83 am:
ef1d2b970c
am:
b3237523ee
Change-Id: If7f16f7bf024659c71770ccce03141edf694d561
Alan Viverette [Wed, 7 Dec 2016 17:10:55 +0000 (17:10 +0000)]
Add missing API diffs for support library 25.0.0 am:
94280c0a91
am:
6b1507c6b0
Change-Id: I6c64979fcd0873a810a17474f8c0e6c4044d05cc
Android Build Merger (Role) [Wed, 7 Dec 2016 17:03:39 +0000 (17:03 +0000)]
Merge "Merge "Add legacy-performance-test-hostdex target" am:
f9587a35ba am:
c5f2b08e83 am:
ef1d2b970c" into nyc-mr2-dev-plus-aosp
Alan Viverette [Wed, 7 Dec 2016 17:02:54 +0000 (17:02 +0000)]
Add missing API diffs for support library 25.0.0
am:
94280c0a91
Change-Id: Ia5b4506fa104b161b2f65dd7820f2dec65e65232
Paul Duffin [Wed, 7 Dec 2016 17:02:53 +0000 (17:02 +0000)]
Merge "Add legacy-performance-test-hostdex target" am:
f9587a35ba am:
c5f2b08e83
am:
ef1d2b970c
Change-Id: I1236606734e202f674cf8306b6e1734ea683dcc2
Jeff Sharkey [Tue, 6 Dec 2016 23:47:00 +0000 (16:47 -0700)]
Fix two StrictMode stack collection bugs.
When Binder calls are nested, we can quickly end up with a snowball
of stacktraces that can cause the original transaction to fail. This
CL makes two specific changes to alleviate this pressure:
-- Consider a nested Binder call from PID A -> B -> C. If both B and
C encounter dozens of StrictMode violations, then gatheredViolations
in B will end up with 10 ViolationInfo (5 from B and 5 from C). This
problem only grows with each successive nested call. To solve this,
always limit ourselves to only ever write out 3 ViolationInfo from
any given process.
-- CrashInfo already nicely truncates any large stack traces to 20kB,
but readAndHandleBinderCallViolations() blindly appends the entire
local trace, and never considers truncating again. Similar to the
first problem above, nested calls can quickly cause the stackTrace
value to explode in size. To solve this, we always re-truncate the
stackTrace value after appending our local stack.
Also fix some NPE bugs when missing crashInfo.
(cherry-picked from commit
58f27b5033542150a78fb050e2f85253a48efa67)
Test: builds, boots
Bug:
32575987
Change-Id: Ie8373ca277296f920f2b1c564d419c702a8ee0f2
Paul Duffin [Wed, 7 Dec 2016 16:55:29 +0000 (16:55 +0000)]
Merge "Add legacy-performance-test-hostdex target" am:
f9587a35ba
am:
c5f2b08e83
Change-Id: I06eaa24ac578cef6712099f3e12aeac92df89c59
Paul Duffin [Wed, 7 Dec 2016 16:47:24 +0000 (16:47 +0000)]
Merge "Add legacy-performance-test-hostdex target"
am:
f9587a35ba
Change-Id: Id400bbe4ca3ab4c348c07c76dbbdf868d9335087
Paul Duffin [Wed, 7 Dec 2016 16:37:10 +0000 (16:37 +0000)]
Merge "Add legacy-performance-test-hostdex target"
Wale Ogunwale [Wed, 7 Dec 2016 16:09:07 +0000 (16:09 +0000)]
Merge "Revert "Correct error in Configuration.updateFrom""
Wale Ogunwale [Wed, 7 Dec 2016 16:00:53 +0000 (16:00 +0000)]
Revert "Correct error in Configuration.updateFrom"
Change is preventing the device from showing the lock screen
after the boot animation.
This reverts commit
4647acb60e407670356c628d3a823c172dfeea64.
Bug:
33098677
Change-Id: If7ecb04b74d5b626c7c3517e7e8d1dc1566ccb17
Mike Reed [Fri, 2 Dec 2016 20:36:59 +0000 (15:36 -0500)]
switch over clip calls to use SkClipOp instead of SkRegion::Op
Change-Id: I67d23c487b5249bc31d96e3b2393f693c0b2bcff
Alan Viverette [Fri, 11 Nov 2016 22:11:01 +0000 (17:11 -0500)]
Add missing API diffs for support library 25.0.0
Bug:
33408968
Test: n/a
Change-Id: I497b2a24248c1511c0d6eca4d5951451e4870b83
TreeHugger Robot [Wed, 7 Dec 2016 14:29:25 +0000 (14:29 +0000)]
Merge "Fix javadoc of EXTRA_PROVISIONING_KEEP_ACCOUNT_ON_MIGRATION"
Paul Duffin [Wed, 7 Dec 2016 14:21:53 +0000 (14:21 +0000)]
Add legacy-performance-test-hostdex target
This is needed for some internal targets that currently depend
directly on the source files and which break when the source
file is moved.
Bug:
30188076
Test: make legacy-performance-test-hostdex
Change-Id: I653325605204c1f272bd5f669e2297eedeaf7d61
Hal Canary [Thu, 24 Nov 2016 01:41:22 +0000 (20:41 -0500)]
SkImageEncoder->SkEncodeImage
Test: none
Change-Id: I15630d2852d12840329181f135852e28d287bbcf
(cherry picked from commit
8c6bac4c77caeefb667bec90d16b5384fd2b2b31)
Paul Duffin [Wed, 7 Dec 2016 13:24:14 +0000 (13:24 +0000)]
Merge "Replace core-junit with junit" am:
6ac5293751 am:
a4d7100a3b am:
9cb5f2815d
am:
b6961ffa53
Change-Id: Id397baf01c8285b0843a66afd544ddf89abf451f
Paul Duffin [Wed, 7 Dec 2016 13:16:12 +0000 (13:16 +0000)]
Merge "Replace core-junit with junit" am:
6ac5293751 am:
a4d7100a3b
am:
9cb5f2815d
Change-Id: Ic5d35084e11387696997082f9c83ef25f543590b
Paul Duffin [Wed, 7 Dec 2016 13:08:36 +0000 (13:08 +0000)]
Merge "Replace core-junit with junit" am:
6ac5293751
am:
a4d7100a3b
Change-Id: If81ca0656d26e2b0e05913c491615f769cb63b55
Paul Duffin [Wed, 7 Dec 2016 13:00:32 +0000 (13:00 +0000)]
Merge "Replace core-junit with junit"
am:
6ac5293751
Change-Id: I855552fe62801b2534ef63c2c62919bbd845a9af
Paul Duffin [Wed, 7 Dec 2016 12:52:01 +0000 (12:52 +0000)]
Merge "Replace core-junit with junit"
Erik Kline [Wed, 7 Dec 2016 09:42:07 +0000 (09:42 +0000)]
Merge "Handle IpReachabilityMonitor errors better." am:
3af34c8e0a am:
4467b79592 am:
7549504970
am:
cc8bbffbd6
Change-Id: Ib4c34608802e1180df2175edae8736a6e78a269f
Erik Kline [Wed, 7 Dec 2016 09:38:06 +0000 (09:38 +0000)]
Merge "Handle IpReachabilityMonitor errors better." am:
3af34c8e0a am:
4467b79592
am:
7549504970
Change-Id: Icf0ac5ea30fb0a72038979793ea8c673963a7764
Erik Kline [Wed, 7 Dec 2016 09:30:09 +0000 (09:30 +0000)]
Merge "Handle IpReachabilityMonitor errors better." am:
3af34c8e0a
am:
4467b79592
Change-Id: I5d4d2d9888d85a684425b8204785099f818e6546
Erik Kline [Wed, 7 Dec 2016 09:26:05 +0000 (09:26 +0000)]
Merge "Handle IpReachabilityMonitor errors better."
am:
3af34c8e0a
Change-Id: Ie13ed70165359e8f312a3744cc26a8d1b6f4730c
Treehugger Robot [Wed, 7 Dec 2016 09:17:21 +0000 (09:17 +0000)]
Merge "Handle IpReachabilityMonitor errors better."
TreeHugger Robot [Wed, 7 Dec 2016 08:21:38 +0000 (08:21 +0000)]
Merge "Fix two StrictMode stack collection bugs."
Erik Kline [Fri, 14 Oct 2016 09:33:22 +0000 (18:33 +0900)]
Handle IpReachabilityMonitor errors better.
If construction of a new IpReachabilityMonitor throws an IAE then
log it and immediately call onProvisioningFailure().
Test: runtest frameworks-wifi
passes, except for selectQualifiedNetworkDoesNotChooseDeletedEphemeral()
which fails with an NPE for unrelated reasons.
Bug:
31038971
Bug:
31742703
Change-Id: Ie91b8bdd509d06ad54d062bf446e74c092eb096c
(cherry picked from commit
e4526604664cb66ecdcbeca4d8f64e8c94750c31)
Jeff Sharkey [Wed, 7 Dec 2016 07:06:05 +0000 (07:06 +0000)]
Merge "Move more installd methods to Binder." am:
3101778fb2 am:
f058c4048a am:
2c01c43055
am:
173f073ff8
Change-Id: I34f90d25ecc26db6f3f07bc92cef2d7514de1c8a
Jeff Sharkey [Wed, 7 Dec 2016 06:58:25 +0000 (06:58 +0000)]
Merge "Move more installd methods to Binder." am:
3101778fb2 am:
f058c4048a
am:
2c01c43055
Change-Id: Iba90979d45d700e753a875e1a3b436ca6572fd5d
Jeff Sharkey [Wed, 7 Dec 2016 06:53:34 +0000 (06:53 +0000)]
Merge "Move more installd methods to Binder." am:
3101778fb2
am:
f058c4048a
Change-Id: I50ea69a6f264df7a674b8fb2fc19c02bdf5ca9db
Jeff Sharkey [Wed, 7 Dec 2016 06:46:15 +0000 (06:46 +0000)]
Merge "Move more installd methods to Binder."
am:
3101778fb2
Change-Id: I35d40a7a2a368cc36a2d265db87328f3f489fec9
Jeff Sharkey [Wed, 7 Dec 2016 06:39:27 +0000 (06:39 +0000)]
Merge "Move more installd methods to Binder."
Jeff Sharkey [Tue, 6 Dec 2016 23:47:00 +0000 (16:47 -0700)]
Fix two StrictMode stack collection bugs.
When Binder calls are nested, we can quickly end up with a snowball
of stacktraces that can cause the original transaction to fail. This
CL makes two specific changes to alleviate this pressure:
-- Consider a nested Binder call from PID A -> B -> C. If both B and
C encounter dozens of StrictMode violations, then gatheredViolations
in B will end up with 10 ViolationInfo (5 from B and 5 from C). This
problem only grows with each successive nested call. To solve this,
always limit ourselves to only ever write out 3 ViolationInfo from
any given process.
-- CrashInfo already nicely truncates any large stack traces to 20kB,
but readAndHandleBinderCallViolations() blindly appends the entire
local trace, and never considers truncating again. Similar to the
first problem above, nested calls can quickly cause the stackTrace
value to explode in size. To solve this, we always re-truncate the
stackTrace value after appending our local stack.
Also fix some NPE bugs when missing crashInfo.
Test: builds, boots
Bug:
32575987
Change-Id: Ie8373ca277296f920f2b1c564d419c702a8ee0f2
Wale Ogunwale [Wed, 7 Dec 2016 03:54:35 +0000 (03:54 +0000)]
Merge changes Ie0f24598,If49c1b0b
* changes:
Reduce object allocations in WM in some frequently called methods
Introduced WindowContainer.mConsumerWrapperPool
Felipe Leme [Wed, 7 Dec 2016 02:36:40 +0000 (02:36 +0000)]
Merge "Added label for REQUEST_IGNORE_BATTERY_OPTIMIZATIONS permission." into nyc-mr2-dev am:
d95fc2d4c9
am:
5bf4bbea8e
Change-Id: I1e8cb959c31cd4feda3d53414fbc283126df19ca
Felipe Leme [Wed, 7 Dec 2016 02:35:42 +0000 (02:35 +0000)]
Added label for REQUEST_IGNORE_BATTERY_OPTIMIZATIONS permission. am:
965f4265c5
am:
519cb74e92
Change-Id: I988f82958648d6e141e3c161f6e7e72346d0a818
Andreas Gampe [Wed, 7 Dec 2016 02:31:49 +0000 (02:31 +0000)]
Merge "Workaround for javac compilation issue of lambda code" am:
90e5fc0970 am:
1c1782cb06 am:
9d267851b8
am:
4299191060
Change-Id: I849032d9b56c4a1c22ea7f33fe3787db876e1aac
Felipe Leme [Wed, 7 Dec 2016 02:31:47 +0000 (02:31 +0000)]
Merge "Added label for REQUEST_IGNORE_BATTERY_OPTIMIZATIONS permission." into nyc-mr2-dev
am:
d95fc2d4c9
Change-Id: I1897900ed10da2adcb49f144b549044f46e530ba
Felipe Leme [Wed, 7 Dec 2016 02:31:41 +0000 (02:31 +0000)]
Added label for REQUEST_IGNORE_BATTERY_OPTIMIZATIONS permission.
am:
965f4265c5
Change-Id: Ib7380a343f55e262c2df61d7ad9fc9e8e959a7b7
Andreas Gampe [Wed, 7 Dec 2016 02:27:41 +0000 (02:27 +0000)]
Merge "Workaround for javac compilation issue of lambda code" am:
90e5fc0970 am:
1c1782cb06
am:
9d267851b8
Change-Id: Ib7783ecd435367b8e2d0a75b1f982818cde681f5
TreeHugger Robot [Wed, 7 Dec 2016 02:24:34 +0000 (02:24 +0000)]
Merge "Added label for REQUEST_IGNORE_BATTERY_OPTIMIZATIONS permission." into nyc-mr2-dev
Andreas Gampe [Wed, 7 Dec 2016 02:19:52 +0000 (02:19 +0000)]
Merge "Workaround for javac compilation issue of lambda code" am:
90e5fc0970
am:
1c1782cb06
Change-Id: Ic766abed3d5b2cd2cce4f011667c0df8cc7b0ea0
Andreas Gampe [Wed, 7 Dec 2016 02:12:39 +0000 (02:12 +0000)]
Merge "Workaround for javac compilation issue of lambda code"
am:
90e5fc0970
Change-Id: Ie7f376587c793ef9312626e41ee4be40f66de5f4
Tomasz Mikolajewski [Wed, 7 Dec 2016 02:09:12 +0000 (02:09 +0000)]
Merge "Fix crashing StrictJarFile due to doubled closing." am:
68ea36243d am:
15cd392108 am:
3199d58939
am:
37541865f3
Change-Id: Iae24b046178c00e4e8cda7ee1dc25c993ef38c0b
Andreas Gampe [Wed, 7 Dec 2016 02:05:08 +0000 (02:05 +0000)]
Merge "Workaround for javac compilation issue of lambda code"
Tomasz Mikolajewski [Wed, 7 Dec 2016 02:01:12 +0000 (02:01 +0000)]
Merge "Fix crashing StrictJarFile due to doubled closing." am:
68ea36243d am:
15cd392108
am:
3199d58939
Change-Id: I269b4a0a7fcbb30804a3dd39870cce927c2b9596
Tomasz Mikolajewski [Wed, 7 Dec 2016 01:54:13 +0000 (01:54 +0000)]
Merge "Fix crashing StrictJarFile due to doubled closing." am:
68ea36243d
am:
15cd392108
Change-Id: I63034776a185682f11ea736b0d37a4b3be31bc47
Jeff Sharkey [Tue, 6 Dec 2016 06:39:46 +0000 (23:39 -0700)]
Move more installd methods to Binder.
Test: builds, boots, apps install fine
Bug:
13758960,
30944031
Change-Id: Ic00968214cec03d67fff7964e5175ab9e6132b36
Jeremy Joslin [Wed, 7 Dec 2016 01:50:17 +0000 (01:50 +0000)]
Merge "Adding a new string array resource for network recommendations." am:
54710df28d am:
ea968e411c -s ours am:
472d5ecb5f -s ours
am:
9347a4f38f -s ours
Change-Id: I14d558a02bfd5617e0e04427e23bc2c4f000d88f
Tomasz Mikolajewski [Wed, 7 Dec 2016 01:50:08 +0000 (01:50 +0000)]
Merge "Fix crashing StrictJarFile due to doubled closing."
am:
68ea36243d
Change-Id: I40c0c1387c2492c8ce4eec2623f25b2f041c13ec
Mark Renouf [Tue, 1 Nov 2016 15:48:24 +0000 (11:48 -0400)]
Workaround for javac compilation issue of lambda code
Since ag/
32554459 some Robolectric tests are compiling
framework code with javac. For reasons unclear so far this
code fails to compile with javac:
> ShortcutService.java:408: error: variable ri might not have been initialized
https://android-build.googleplex.com/builds/submitted/
3416256/angelfish-userdebug/latest/logs
Removing the lambda expressions corrects the issue.
(cherry picked from commit
e065f7c5a9ad4e47f5490793401445660af37624)
BUG:
32554459
Test: m
Change-Id: I189c8ef02dc93b46ef6418c1ff14f2312097898a
Jeremy Joslin [Wed, 7 Dec 2016 01:42:22 +0000 (01:42 +0000)]
Merge "Adding a new string array resource for network recommendations." am:
54710df28d am:
ea968e411c -s ours
am:
472d5ecb5f -s ours
Change-Id: Ifa31e990cf70eb861588f1cf1f4539fe0cc78319
Treehugger Robot [Wed, 7 Dec 2016 01:40:48 +0000 (01:40 +0000)]
Merge "Fix crashing StrictJarFile due to doubled closing."
Jeremy Joslin [Wed, 7 Dec 2016 01:34:46 +0000 (01:34 +0000)]
Merge "Adding a new string array resource for network recommendations." am:
54710df28d
am:
ea968e411c -s ours
Change-Id: I32b30b622e71c782deb21c627b33f23422c3d3ad
Jeremy Joslin [Wed, 7 Dec 2016 01:27:10 +0000 (01:27 +0000)]
Merge "Adding a new string array resource for network recommendations."
am:
54710df28d
Change-Id: I7d86f734b88ff4f008e5b2e250f97f8836780ab1
Treehugger Robot [Wed, 7 Dec 2016 01:17:16 +0000 (01:17 +0000)]
Merge "Adding a new string array resource for network recommendations."
Sudheer Shanka [Wed, 7 Dec 2016 00:36:10 +0000 (16:36 -0800)]
Update IActivityManager, ContentProviderHolder in preloaded-classes.
Bug:
30977067
Test: N/A
Change-Id: I42eb1f014a6784eeea71da6646fa958e39c129ea
Bill Yi [Wed, 7 Dec 2016 00:22:07 +0000 (00:22 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am:
82834baa35 am:
eaa66c3082 -s ours am:
f5795bcf54 -s ours
am:
281451edc5 -s ours
Change-Id: Ide00ab2b5f0d54bea5edfc5baa7c573af01327ff
Jeremy Joslin [Wed, 7 Dec 2016 00:21:11 +0000 (00:21 +0000)]
Merge "API for requesting network recommendations." am:
800a4e753e am:
2b57c69e25 am:
33e8de479a
am:
2724906a6c -s ours
Change-Id: Iaeffc3d599f1f156f70dadcf926d4d3a2e4a41d1
Jeff Sharkey [Wed, 7 Dec 2016 00:20:09 +0000 (00:20 +0000)]
Merge "Move moveCompleteApp() to Binder." am:
019867cb52 am:
19426fef23 am:
d917e23bbb
am:
b7abefa16a
Change-Id: I4779344082c51ecd301be2b2df0947790403273d
Jeremy Joslin [Thu, 1 Dec 2016 00:44:11 +0000 (16:44 -0800)]
Adding a new string array resource for network recommendations.
The new resource allows for multiple package names to be specified
in priority order.
Test: Nothing to test.
BUG:
33158362
Merged-In: I4a066d9220c723a17dd11e2566161fade6bb471b
Merged-In: Ifed73e493fe7de64b3dd051a53d16d39da1e4eef
Change-Id: I26ac87a49ae94dd0763173af5c8a2c6abe7cb5f8
Bill Yi [Wed, 7 Dec 2016 00:13:21 +0000 (00:13 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am:
82834baa35 am:
eaa66c3082 -s ours
am:
f5795bcf54 -s ours
Change-Id: I1e0e1fc911d6afa7dbca3ec89a024944790194d8
Jeremy Joslin [Wed, 7 Dec 2016 00:12:27 +0000 (00:12 +0000)]
Merge "API for requesting network recommendations." am:
800a4e753e am:
2b57c69e25
am:
33e8de479a
Change-Id: Ibf7f6a12eeb92f56c5873c3f7e3e10ff4adbd8fd
Jeff Sharkey [Wed, 7 Dec 2016 00:11:40 +0000 (00:11 +0000)]
Merge "Move moveCompleteApp() to Binder." am:
019867cb52 am:
19426fef23
am:
d917e23bbb
Change-Id: I56d8e35174cce6a892f73f32b8246a377ba645ab
Felipe Leme [Mon, 5 Dec 2016 18:51:30 +0000 (10:51 -0800)]
Added label for REQUEST_IGNORE_BATTERY_OPTIMIZATIONS permission.
Change-Id: I84dc652f7297c2b8c9351e737074ddf43754718d
Fixes:
32950329
Test: manually verified it
Bill Yi [Wed, 7 Dec 2016 00:06:43 +0000 (00:06 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am:
82834baa35
am:
eaa66c3082 -s ours
Change-Id: I009f3327782fdb3506d30cbf75f59bbed31ed2e1
Jeremy Joslin [Wed, 7 Dec 2016 00:05:29 +0000 (00:05 +0000)]
Merge "API for requesting network recommendations." am:
800a4e753e
am:
2b57c69e25
Change-Id: I8f2357942919193a22e97e4f1d9ec415b736565c
OSDN Git Service
