OSDN Git Service
Jason Monk [Mon, 3 Apr 2017 18:18:41 +0000 (18:18 +0000)]
Merge "Fix battery icon dark initialization" into oc-dev am:
cb4ed821f2
am:
17e605aae8
Change-Id: I31c58ac77e4df9e32958659519229467a82d2f08
George Mount [Mon, 3 Apr 2017 18:13:28 +0000 (18:13 +0000)]
Merge "Allow committing allowing state loss on detached FragmentManager." into oc-dev am:
e9679db5e2
am:
834752d4b2
Change-Id: I8f60a0e8b45d6c9c0944b47d867cbb5727fafc7a
Diego Perez [Mon, 3 Apr 2017 18:10:52 +0000 (18:10 +0000)]
Merge "Fix broken perf tests" into oc-dev am:
974b5b13b2
am:
471872e4b8
Change-Id: I9941c82ab0467fd885262aba22078fef5fda8769
Jason Monk [Mon, 3 Apr 2017 18:09:36 +0000 (18:09 +0000)]
Merge "QS: Add transient animations for bluetooth and wifi" into oc-dev am:
a56b6e530a
am:
f6e22d4f36
Change-Id: Ib70b009369497f3c11369b01093298bb287f432f
Jason Monk [Mon, 3 Apr 2017 18:08:17 +0000 (18:08 +0000)]
Merge "Fix losing status bar icons on config changes" into oc-dev am:
f244f7e1b8
am:
5c549b3a2a
Change-Id: I73db4793b09c095404e61e7b377579108116c5f2
Todd Kennedy [Mon, 3 Apr 2017 18:02:24 +0000 (18:02 +0000)]
Merge "Implement service filtering" into oc-dev am:
35110948b7
am:
48a2f0036c
Change-Id: I479a1db354a7f61e669f67241a0648d843301e95
Jason Monk [Mon, 3 Apr 2017 18:01:17 +0000 (18:01 +0000)]
Merge "Fix battery icon dark initialization" into oc-dev
am:
cb4ed821f2
Change-Id: I34cc7adb16ec21ba8c9cf210b3ca61b2c9506290
Bryce Lee [Mon, 3 Apr 2017 18:00:08 +0000 (18:00 +0000)]
Merge "Add app bounds to configuration." into oc-dev am:
7efe56b779
am:
59d1f8a024
Change-Id: Iae8e43872eee11214347cfb935793e9356a50e08
Chris Wren [Mon, 3 Apr 2017 17:58:54 +0000 (17:58 +0000)]
Merge "standardize network policy notification IDs" into oc-dev am:
ef3a28cb92
am:
04b0e05bef
Change-Id: Ifd5acffff7b45e02d5ba404550e32e16b5003bd7
George Mount [Mon, 3 Apr 2017 17:57:27 +0000 (17:57 +0000)]
Merge "Allow committing allowing state loss on detached FragmentManager." into oc-dev
am:
e9679db5e2
Change-Id: I4192bc42bdc35ff29ac6e3c4ce2bb67f5a412c4b
Jason Monk [Mon, 3 Apr 2017 17:57:23 +0000 (17:57 +0000)]
Merge "Switch cast over to support library dialog" into oc-dev am:
de8cd0e8f5
am:
4209e9d739
Change-Id: I5311fff98a4735bf79c1f147e5733c38caf9da37
Jorim Jaggi [Mon, 3 Apr 2017 17:56:10 +0000 (17:56 +0000)]
Revert "Temporarily bg-whitelist the default container package-cleaning service" am:
91232840aa
am:
c4bfd5e751
Change-Id: I83a8d235fca0991f394cd9da899089a96bc0a7f3
Tony Mak [Mon, 3 Apr 2017 17:54:39 +0000 (17:54 +0000)]
Merge "Revert "Whitelist ManagedProvisioning from bg check"" into oc-dev am:
0c224f9674
am:
aa82698241
Change-Id: If67406031276a6d958a9c3261a3c6ef51907f2c4
Diego Perez [Mon, 3 Apr 2017 17:52:17 +0000 (17:52 +0000)]
Merge "Fix broken perf tests" into oc-dev
am:
974b5b13b2
Change-Id: Ic9442beef0e2bec7db53b8e6ef1ff47dc6d12769
Jason Monk [Mon, 3 Apr 2017 17:51:00 +0000 (17:51 +0000)]
Merge "QS: Add transient animations for bluetooth and wifi" into oc-dev
am:
a56b6e530a
Change-Id: I43f7dafe192930ce5f3a78db5e586d62ba66a1c4
Jason Monk [Mon, 3 Apr 2017 17:49:45 +0000 (17:49 +0000)]
Merge "Fix losing status bar icons on config changes" into oc-dev
am:
f244f7e1b8
Change-Id: I08a75d88e6764703d4c450b9ee5f81a824e2adc9
Hyunyoung Song [Mon, 3 Apr 2017 17:49:19 +0000 (17:49 +0000)]
Merge "Prevent NPE when draw is called without bounds being set Test: unit test inside AdaptiveIconDrawableTest.java" into oc-dev am:
891e03203c
am:
d16d17881e
Change-Id: I96db9ee1a5bb9fc2085e43733638a6b21f50fe65
Todd Kennedy [Mon, 3 Apr 2017 17:46:59 +0000 (17:46 +0000)]
Merge "Implement service filtering" into oc-dev
am:
35110948b7
Change-Id: Ie19ae7075e8fe35857a60306452fe19b06bb1848
Jeff Sharkey [Mon, 3 Apr 2017 17:44:51 +0000 (17:44 +0000)]
Merge "Lower-level user enumeration; fix disabled bug." into oc-dev am:
713b7c6b53
am:
f00900d7d4
Change-Id: I81fdae7cc9a09fd8231cd1e2f30113cf02884b59
Jeff Sharkey [Mon, 3 Apr 2017 17:43:10 +0000 (17:43 +0000)]
Merge "We really want f_frsize and f_bavail." into oc-dev am:
fd463121c6
am:
f9f7d71cc5
Change-Id: Ifa28cb4515d6e9e74380fe70d73aec292d126ac9
Bryce Lee [Mon, 3 Apr 2017 17:41:40 +0000 (17:41 +0000)]
Merge "Add app bounds to configuration." into oc-dev
am:
7efe56b779
Change-Id: If871d90a72f675a93503e883135ebee77f12d971
Chris Wren [Mon, 3 Apr 2017 17:40:29 +0000 (17:40 +0000)]
Merge "standardize network policy notification IDs" into oc-dev
am:
ef3a28cb92
Change-Id: I0a5f11c0068a6da11bbb18d7a6f8e42f00655d74
Jason Monk [Mon, 3 Apr 2017 17:38:57 +0000 (17:38 +0000)]
Merge "Switch cast over to support library dialog" into oc-dev
am:
de8cd0e8f5
Change-Id: I997130142d426967d60e9c384056c3aba1ea5af5
Jorim Jaggi [Mon, 3 Apr 2017 17:37:40 +0000 (17:37 +0000)]
Revert "Temporarily bg-whitelist the default container package-cleaning service"
am:
91232840aa
Change-Id: I0fefe67edea6e5a0c435bbe73730d5ede3adee14
Tony Mak [Mon, 3 Apr 2017 17:36:07 +0000 (17:36 +0000)]
Merge "Revert "Whitelist ManagedProvisioning from bg check"" into oc-dev
am:
0c224f9674
Change-Id: I6dc643e93b2d542b407abd5aaa7d832df47e47f7
Yin-Chia Yeh [Mon, 3 Apr 2017 17:34:03 +0000 (17:34 +0000)]
Merge "Camera: add batching support to HAL1 recording path" into oc-dev am:
e1df48d3a0
am:
f9da2da1fe
Change-Id: I4681267c10af539ee9a433f3ccdc397894b8f552
Hyunyoung Song [Mon, 3 Apr 2017 17:32:51 +0000 (17:32 +0000)]
Merge "Prevent NPE when draw is called without bounds being set Test: unit test inside AdaptiveIconDrawableTest.java" into oc-dev
am:
891e03203c
Change-Id: I14746f95c369503f5515e5123a481798fc76197c
Jeff Sharkey [Mon, 3 Apr 2017 17:29:45 +0000 (17:29 +0000)]
Merge "Lower-level user enumeration; fix disabled bug." into oc-dev
am:
713b7c6b53
Change-Id: Ic2edcfc0d30bc5429753c313d31703802e630851
Jeff Sharkey [Mon, 3 Apr 2017 17:27:48 +0000 (17:27 +0000)]
Merge "We really want f_frsize and f_bavail." into oc-dev
am:
fd463121c6
Change-Id: I55aebb3b452f4d41af7e5f54d0dff27e9bc6cca6
Yin-Chia Yeh [Mon, 3 Apr 2017 17:24:40 +0000 (17:24 +0000)]
Merge "Camera: add batching support to HAL1 recording path" into oc-dev
am:
e1df48d3a0
Change-Id: I8e43b2faf95002b33bd8b861b046cd15c02f38d3
TreeHugger Robot [Mon, 3 Apr 2017 16:37:07 +0000 (16:37 +0000)]
Merge "Fix battery icon dark initialization" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 16:34:12 +0000 (16:34 +0000)]
Merge "Allow committing allowing state loss on detached FragmentManager." into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 15:57:34 +0000 (15:57 +0000)]
Merge "Fix broken perf tests" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 15:37:13 +0000 (15:37 +0000)]
Merge "QS: Add transient animations for bluetooth and wifi" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 15:10:32 +0000 (15:10 +0000)]
Merge "Launch Intents from QS security footer as current user"
TreeHugger Robot [Mon, 3 Apr 2017 15:05:34 +0000 (15:05 +0000)]
Merge "Fix losing status bar icons on config changes" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 14:45:52 +0000 (14:45 +0000)]
Merge "Implement service filtering" into oc-dev
Bryce Lee [Mon, 3 Apr 2017 14:30:42 +0000 (14:30 +0000)]
Merge "Add app bounds to configuration." into oc-dev
Diego Perez [Mon, 27 Mar 2017 15:49:17 +0000 (16:49 +0100)]
Fix broken perf tests
Do not dispose Bridge on tearDown. The concept of disposing the Bridge
only made sense when we were loading it dynamically. Some classes have
static initializers that will fail after the dispose (like Typeface).
Test: N/A
Change-Id: I9c934432232bda02a4d26425587096fb6dc957b0
(cherry picked from commit
f1532e36e16e2b55f175a24f11df91cf344833ff)
Chris Wren [Mon, 3 Apr 2017 13:42:38 +0000 (13:42 +0000)]
Merge "standardize network policy notification IDs" into oc-dev
Jason Monk [Mon, 3 Apr 2017 13:34:13 +0000 (13:34 +0000)]
Merge "Switch cast over to support library dialog" into oc-dev
Jorim Jaggi [Mon, 3 Apr 2017 12:40:39 +0000 (14:40 +0200)]
Revert "Temporarily bg-whitelist the default container package-cleaning service"
Causes bootloop.
This reverts commit
f16e7423c79c4ccccf43265a5b1966eb8e7f7be7.
Bartosz Fabianowski [Mon, 3 Apr 2017 11:29:12 +0000 (13:29 +0200)]
Launch Intents from QS security footer as current user
Intents triggered from QS should be resolved as the current user,
not as the user that QS is running as (which will always be user 0).
ActivityStarter knows how to do this and can handle this for us
automatically.
Bug:
36118203
Test: Manual
Change-Id: I48d880f0a17d7a9f218ab07ef807ad49ebeda624
TreeHugger Robot [Mon, 3 Apr 2017 11:06:53 +0000 (11:06 +0000)]
Merge "Revert "Whitelist ManagedProvisioning from bg check"" into oc-dev
Lorenzo Colitti [Mon, 3 Apr 2017 11:06:24 +0000 (11:06 +0000)]
Merge "Add test coverage for NetworkSpecifiers." am:
9a029b5262 am:
0e068f6360 am:
8ee38521bc
am:
391c97d506
Change-Id: Ia71b72cc10dba6bac7c8fbe1ab3c5f40bc5506ff
Lorenzo Colitti [Mon, 3 Apr 2017 10:59:17 +0000 (10:59 +0000)]
Merge "Add test coverage for NetworkSpecifiers." am:
9a029b5262 am:
0e068f6360
am:
8ee38521bc
Change-Id: Ia7d36096f0e3f0b203d1d838043c03fcd1cea829
Lorenzo Colitti [Mon, 3 Apr 2017 10:52:20 +0000 (10:52 +0000)]
Merge "Add test coverage for NetworkSpecifiers." am:
9a029b5262
am:
0e068f6360
Change-Id: I376b9011aaae7f0b8a2899a942d1a43e26605101
Lorenzo Colitti [Mon, 3 Apr 2017 10:45:22 +0000 (10:45 +0000)]
Merge "Add test coverage for NetworkSpecifiers."
am:
9a029b5262
Change-Id: Ia328b945af4c4f55ef560b33b00fa861b8f81b0d
Treehugger Robot [Mon, 3 Apr 2017 10:37:00 +0000 (10:37 +0000)]
Merge "Add test coverage for NetworkSpecifiers."
TreeHugger Robot [Mon, 3 Apr 2017 09:52:13 +0000 (09:52 +0000)]
Merge "Prevent NPE when draw is called without bounds being set Test: unit test inside AdaptiveIconDrawableTest.java" into oc-dev
Hugo Benichi [Mon, 3 Apr 2017 09:24:14 +0000 (09:24 +0000)]
Merge "ConnectivityService: simplify WakeLock management" am:
c98db5caa2 am:
6db00a22b0 am:
56ca1705d6
am:
e92a4ba79b
Change-Id: Id8ae92f0eec4284ff5ba59a4a8c2227e9a77765a
Hugo Benichi [Mon, 3 Apr 2017 09:17:18 +0000 (09:17 +0000)]
Merge "ConnectivityService: simplify WakeLock management" am:
c98db5caa2 am:
6db00a22b0
am:
56ca1705d6
Change-Id: Iacc2e977c1eec2ebc9deb9395e1f77a62b57f070
Hugo Benichi [Mon, 3 Apr 2017 09:10:44 +0000 (09:10 +0000)]
Merge "ConnectivityService: simplify WakeLock management" am:
c98db5caa2
am:
6db00a22b0
Change-Id: I468e31800d5cfe1dd385d773fcc393b615cfa343
Hugo Benichi [Mon, 3 Apr 2017 09:03:13 +0000 (09:03 +0000)]
Merge "ConnectivityService: simplify WakeLock management"
am:
c98db5caa2
Change-Id: I1e0ae930cd7a329febf21ff3fc83ad2d0a3be69b
Hugo Benichi [Mon, 3 Apr 2017 08:56:23 +0000 (08:56 +0000)]
Merge "ConnectivityService: simplify WakeLock management"
Lorenzo Colitti [Mon, 3 Apr 2017 08:46:35 +0000 (17:46 +0900)]
Add test coverage for NetworkSpecifiers.
Tests various combinations of empty / non-empty NetworkSpecifiers
and changing specifiers on the fly.
Test: ConnectivityServiceTest passes
Bug:
27533960
Change-Id: Ibd6b4efc861dc51689e46f3882ba859223411bf0
TreeHugger Robot [Mon, 3 Apr 2017 08:36:04 +0000 (08:36 +0000)]
Merge "Lower-level user enumeration; fix disabled bug." into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 07:37:44 +0000 (07:37 +0000)]
Merge "We really want f_frsize and f_bavail." into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 07:34:01 +0000 (07:34 +0000)]
Merge "Camera: add batching support to HAL1 recording path" into oc-dev
Hyunyoung Song [Mon, 3 Apr 2017 07:23:49 +0000 (00:23 -0700)]
Prevent NPE when draw is called without bounds being set
Test: unit test inside AdaptiveIconDrawableTest.java
Change-Id: Ic3260ce9c6bae595c7eba7be1cd7ae249939a1cf
Daichi Hirono [Mon, 3 Apr 2017 07:07:03 +0000 (07:07 +0000)]
Merge "Process FuseAppLoop messages in Handler.Callback" into oc-dev am:
cb9ceb3fd4
am:
fd88a3aba7
Change-Id: I14919d6eef09fc3b4fc0f94faae2b6c8c1222abc
Daichi Hirono [Mon, 3 Apr 2017 07:00:35 +0000 (07:00 +0000)]
Merge "Process FuseAppLoop messages in Handler.Callback" into oc-dev
am:
cb9ceb3fd4
Change-Id: I8708c1e60300c5384071106d9b3f75a534d1fbf6
TreeHugger Robot [Mon, 3 Apr 2017 06:54:59 +0000 (06:54 +0000)]
Merge "Process FuseAppLoop messages in Handler.Callback" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 06:49:00 +0000 (06:49 +0000)]
Merge "Process FuseAppLoop messages in Handler.Callback"
Jeff Sharkey [Mon, 3 Apr 2017 06:27:05 +0000 (06:27 +0000)]
Enforce PACKAGE_USAGE_STATS for usage data. am:
6df866a851
am:
979f227fb9
Change-Id: Ia3aaf773b4defb4b1399544ff7475cd4142f16aa
Jeff Sharkey [Mon, 3 Apr 2017 06:26:04 +0000 (06:26 +0000)]
Consistent dump() permission checking. am:
fe9a53bc45
am:
020de02854
Change-Id: Iffbf78a7b48cea41ed4b0763f2452738e084225c
Jeff Sharkey [Mon, 3 Apr 2017 06:19:57 +0000 (06:19 +0000)]
Enforce PACKAGE_USAGE_STATS for usage data.
am:
6df866a851
Change-Id: I52d982ee864903ca93e889aa03f6315438dc6c4b
Jeff Sharkey [Mon, 3 Apr 2017 06:19:02 +0000 (06:19 +0000)]
Consistent dump() permission checking.
am:
fe9a53bc45
Change-Id: I300f8bc07e1266b9e78f56d085cd458862176a85
TreeHugger Robot [Mon, 3 Apr 2017 06:05:12 +0000 (06:05 +0000)]
Merge "Expose ConfigUpdater Intents in SystemApi"
Jeff Sharkey [Mon, 3 Apr 2017 05:42:17 +0000 (23:42 -0600)]
Lower-level user enumeration; fix disabled bug.
UserManager may not have been started yet, so discover users by
looking at filesystem.
Fix disabled bug where default should be "false."
Test: builds, boots
Bug:
36794413
Change-Id: If91fd27b955175072228a93aab4b8ac3b27df0bf
Jeff Sharkey [Mon, 3 Apr 2017 05:24:40 +0000 (23:24 -0600)]
We really want f_frsize and f_bavail.
It's confusing, but f_bsize is not the value you're looking for; the
real block size is f_frsize. Fix all those bugs.
Also, the vast majority of clients are interested in the usable
disk space, not including reserved space.
Test: builds, boots
Bug:
36840579
Change-Id: Ib1470389afd49c14cab62282ec1e978ebb2c4791
Daichi Hirono [Mon, 3 Apr 2017 04:18:40 +0000 (13:18 +0900)]
Process FuseAppLoop messages in Handler.Callback
Previously FuseAppLoop instantiates Runnable for each command, which
causes lots of instantiation and GC.
Test: CTS
Bug:
35229514
Change-Id: Ifea098e5ade044b1a954c0b714c5b3270a95cd1a
Jeff Sharkey [Fri, 31 Mar 2017 20:08:23 +0000 (14:08 -0600)]
Enforce PACKAGE_USAGE_STATS for usage data.
Some system services are offering package usage data through both
public/system APIs and through dump() calls. In principle, usage
data hould always be protected with PACKAGE_USAGE_STATS, so start
enforcing that. (Otherwise if a user blocked PACKAGE_USAGE_STATS
access to an app, that app could still obtain the data via dump()
if they held the DUMP permission.)
Bottom line, let's respect the user's wishes.
Protecting the entire output like this is pretty blunt, but future
CLs can add more nuance to the output if desired.
Test: cts-tradefed run commandAndExit cts-dev -m CtsSecurityTestCases -t android.security.cts.ServicePermissionsTest
Bug:
32806790
Change-Id: I46173562713bea7d89e12a4313c78eb52ea8d77d
Jeff Sharkey [Fri, 31 Mar 2017 20:08:23 +0000 (14:08 -0600)]
Consistent dump() permission checking.
This change introduces new methods on DumpUtils that can check if the
caller has DUMP and/or PACKAGE_USAGE_STATS access. It then moves all
existing dump() methods to use these checks so that we emit
consistent error messages.
Test: cts-tradefed run commandAndExit cts-dev -m CtsSecurityTestCases -t android.security.cts.ServicePermissionsTest
Bug:
32806790
Change-Id: Iaff6b9506818ee082b1e169c89ebe1001b3bfeca
Daichi Hirono [Mon, 3 Apr 2017 04:18:40 +0000 (13:18 +0900)]
Process FuseAppLoop messages in Handler.Callback
Previously FuseAppLoop instantiates Runnable for each command, which
causes lots of instantiation and GC.
Test: CTS
Bug:
35229514
Change-Id: Ifea098e5ade044b1a954c0b714c5b3270a95cd1a
Bill Yi [Mon, 3 Apr 2017 02:32:18 +0000 (02:32 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
8f59f867f9 -s ours am:
14f8818989 -s ours
am:
5220e58299 -s ours
Change-Id: I5c32430cc7341934e7874d1b4715895b336846fb
Bill Yi [Mon, 3 Apr 2017 02:25:51 +0000 (02:25 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
8f59f867f9 -s ours
am:
14f8818989 -s ours
Change-Id: I6e42ae3f5cf5a704b1f3c350af378bd178ac6714
Bill Yi [Mon, 3 Apr 2017 02:18:48 +0000 (02:18 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
8f59f867f9 -s ours
Change-Id: Ief3fa9c34e3a1959e193d35cea0b0ace7168411e
TreeHugger Robot [Mon, 3 Apr 2017 02:11:39 +0000 (02:11 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Pankaj Kanwar [Mon, 3 Apr 2017 01:31:35 +0000 (01:31 +0000)]
Merge "Address API concerns for isConcurrentVoiceAndDataAllowed and OnReceiveUssdResponseCallback."
Roozbeh Pournader [Mon, 3 Apr 2017 00:33:40 +0000 (00:33 +0000)]
Merge "Override bidi property of new emojis" into oc-dev am:
21a5edcc24
am:
09aef96840
Change-Id: I70a00e1bf2e3ffd2787796c7b1e473f12968dd6e
Roozbeh Pournader [Mon, 3 Apr 2017 00:27:42 +0000 (00:27 +0000)]
Merge "Override bidi property of new emojis" into oc-dev
am:
21a5edcc24
Change-Id: Ie37451b8234f1e5c06bb20f1c26e8f832006f3e3
TreeHugger Robot [Mon, 3 Apr 2017 00:21:50 +0000 (00:21 +0000)]
Merge "Override bidi property of new emojis" into oc-dev
Hugo Benichi [Mon, 3 Apr 2017 00:07:16 +0000 (00:07 +0000)]
Merge "ConnectivityService: log wakelock activity in dumps" am:
db104b2367 am:
146914c0d5 am:
bf1b181c63
am:
7346613f27
Change-Id: Id95860ab5d874f24f9fa510a44038ce05bed12f0
Hugo Benichi [Mon, 3 Apr 2017 00:00:19 +0000 (00:00 +0000)]
Merge "ConnectivityService: log wakelock activity in dumps" am:
db104b2367 am:
146914c0d5
am:
bf1b181c63
Change-Id: Id4c980a2a1ef7f51b6a06c7c8636160437e99b84
Hugo Benichi [Thu, 30 Mar 2017 14:18:10 +0000 (23:18 +0900)]
ConnectivityService: simplify WakeLock management
This patch simplifies wakelock management by acknowledging that only one
acquisition at most is in flight at any time. This allows to remove the
serial number associated with wakelock acquisition and to avoid double
release when regaining a default network.
Example of $ adb shell dumpsys connectivity logs:
NetTransition WakeLock activity (most recent first):
03-31 00:15:13.816 - RELEASE (EVENT_CLEAR_NET_TRANSITION_WAKELOCK)
03-31 00:14:59.216 - ACQUIRE for NetworkAgentInfo [WIFI () - 101]
03-31 00:09:05.799 - RELEASE (EVENT_EXPIRE_NET_TRANSITION_WAKELOCK)
03-31 00:08:05.738 - ACQUIRE for NetworkAgentInfo [WIFI () - 100]
Test: watched wakelock section $ adb shell dumpsys connectivity while
turning on and off Wifi (with no other network).
Bug:
36703718
Change-Id: I899b0816c0e41b3991d9540e9b9a604914ff673a
Hugo Benichi [Sun, 2 Apr 2017 23:53:46 +0000 (23:53 +0000)]
Merge "ConnectivityService: log wakelock activity in dumps" am:
db104b2367
am:
146914c0d5
Change-Id: I4d0430a6a5b3a1f97cdc4cf9590e5b0a798ae04f
Hugo Benichi [Sun, 2 Apr 2017 23:47:15 +0000 (23:47 +0000)]
Merge "ConnectivityService: log wakelock activity in dumps"
am:
db104b2367
Change-Id: If08e0088ab25f1494aaf3a339a38e7a8e343d910
Hugo Benichi [Sun, 2 Apr 2017 23:40:25 +0000 (23:40 +0000)]
Merge "ConnectivityService: log wakelock activity in dumps"
Jesse Evans [Sun, 2 Apr 2017 16:09:31 +0000 (16:09 +0000)]
Merge "Adds appropriate filtering for instant apps"
Bill Yi [Sun, 2 Apr 2017 09:25:47 +0000 (09:25 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
2c697884a3 -s ours am:
d6cbc60edc -s ours
am:
6003b7dff2 -s ours
Change-Id: Id1bd20968e08716f37588f7ab8e1fecce000178a
Bill Yi [Sun, 2 Apr 2017 09:24:42 +0000 (09:24 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
bcd194eb04 -s ours am:
4448f63145 -s ours
am:
481fbe66fc -s ours
Change-Id: I15a6e70791de334ca68963e1ed8cb3a55dae493d
Bill Yi [Sun, 2 Apr 2017 09:23:26 +0000 (09:23 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
1058478d5b -s ours am:
c29576d8ab -s ours
am:
2dcedc156a -s ours
Change-Id: I03997e6ac545f54549412b0836a7b22dbb9bb054
Bill Yi [Sun, 2 Apr 2017 09:22:18 +0000 (09:22 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
69dd99c741 -s ours am:
932a818776 -s ours
am:
83d85047bf -s ours
Change-Id: I6f34bb4b7cc5565c6eece31ef40008820e1ab9b6
Bill Yi [Sun, 2 Apr 2017 09:21:12 +0000 (09:21 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
e1a2ddeee8 -s ours am:
11a1d54f70 -s ours
am:
bf317f15e0 -s ours
Change-Id: Ie6a8a4b5255225b6df489bc481c2c9bc0c49ed7a
Bill Yi [Sun, 2 Apr 2017 09:17:29 +0000 (09:17 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
2c697884a3 -s ours
am:
d6cbc60edc -s ours
Change-Id: I6d4593dd6e87a4da1518ee4ef397b3872c58660e
Bill Yi [Sun, 2 Apr 2017 09:17:29 +0000 (09:17 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
45d02673c5 -s ours am:
6139220455 -s ours
am:
d772966366 -s ours
Change-Id: I6a6f304ff3091187baa21ee7516c89653f3deca1
Bill Yi [Sun, 2 Apr 2017 09:16:19 +0000 (09:16 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
bcd194eb04 -s ours
am:
4448f63145 -s ours
Change-Id: I44a2fcad7ce27350d110263ce2083b489bb47762
Bill Yi [Sun, 2 Apr 2017 09:15:09 +0000 (09:15 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
1058478d5b -s ours
am:
c29576d8ab -s ours
Change-Id: I6be632590f27cfa2beefe42b4fb597a76a479cb1
Bill Yi [Sun, 2 Apr 2017 09:13:59 +0000 (09:13 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
69dd99c741 -s ours
am:
932a818776 -s ours
Change-Id: I69cc4dc851739b9d09bd82790c0a9202922a5a28