OSDN Git Service
Seigo Nonaka [Fri, 14 Apr 2017 22:20:35 +0000 (22:20 +0000)]
Merge "Fix boot loop issue on Android Wear." into oc-dev
am:
5f9fde884b
Change-Id: Ie73c0cfd4c348d1217338bb40694f20559702bcb
TreeHugger Robot [Fri, 14 Apr 2017 22:16:19 +0000 (22:16 +0000)]
Merge "Fix boot loop issue on Android Wear." into oc-dev
Philip P. Moltmann [Fri, 14 Apr 2017 22:11:06 +0000 (22:11 +0000)]
Merge "Fix some racines in AutofillManager" into oc-dev
am:
2ddd69ce1a
Change-Id: Iec8454a36985484148b821f598446d5305c601bc
TreeHugger Robot [Fri, 14 Apr 2017 22:04:34 +0000 (22:04 +0000)]
Merge "Fix some racines in AutofillManager" into oc-dev
Romain Guy [Fri, 14 Apr 2017 21:14:10 +0000 (21:14 +0000)]
Merge "Add BitmapFactory.Options.inColorSpace" into oc-dev
am:
c99bcc69f7
Change-Id: I016c2b265dc471b74cd703281b3de60d7e54bfea
Romain Guy [Fri, 14 Apr 2017 21:08:34 +0000 (21:08 +0000)]
Merge "Add BitmapFactory.Options.inColorSpace" into oc-dev
Romain Guy [Fri, 14 Apr 2017 21:05:55 +0000 (21:05 +0000)]
Merge "Clarify doc for Bitmap.createBitmap()" into oc-dev
am:
1eaab2db82
Change-Id: I2b843c5f94460f5ee7d9a7767d0411fe6c117a3c
Jason Monk [Fri, 14 Apr 2017 20:58:31 +0000 (20:58 +0000)]
Merge "Convert signal icon to be custom drawable" into oc-dev
am:
06426bf652
Change-Id: I3fddf788317b91e65c22ec75bb3e6aa0509f64fe
TreeHugger Robot [Fri, 14 Apr 2017 20:53:22 +0000 (20:53 +0000)]
Merge "Clarify doc for Bitmap.createBitmap()" into oc-dev
Romain Guy [Fri, 14 Apr 2017 20:49:20 +0000 (20:49 +0000)]
Merge "Fix API feedback on Color" into oc-dev
am:
03758701fb
Change-Id: I5b3d30552adedc603a97b65b1f739c19142e70b2
Mady Mellor [Fri, 14 Apr 2017 20:48:02 +0000 (20:48 +0000)]
Merge "Fix issue where menu items visible on 'closed' notification on lockscreen" into oc-dev
am:
4b7b01c1cc
Change-Id: Ib51c0125042553302584c79a360ee07f2ae1c1b8
TreeHugger Robot [Fri, 14 Apr 2017 20:44:14 +0000 (20:44 +0000)]
Merge "Convert signal icon to be custom drawable" into oc-dev
TreeHugger Robot [Fri, 14 Apr 2017 20:42:15 +0000 (20:42 +0000)]
Merge "Fix API feedback on Color" into oc-dev
Mady Mellor [Fri, 14 Apr 2017 20:40:00 +0000 (20:40 +0000)]
Merge "Fix issue where menu items visible on 'closed' notification on lockscreen" into oc-dev
Nathan Harold [Fri, 14 Apr 2017 20:28:56 +0000 (20:28 +0000)]
Merge changes from topic 'ipsec-api-tweaks-merge' into oc-dev
am:
9361283073
Change-Id: I4ca6b6293dabe856098dda98ce6ca804fa419b44
Nathan Harold [Fri, 14 Apr 2017 20:21:13 +0000 (20:21 +0000)]
Merge changes from topic 'ipsec-api-tweaks-merge' into oc-dev
* changes:
Add FileDescriptor Versions of applyTransportModeTransform()
IpSecManager and IpSecAlgorithm API Tweaks
Android Build Merger (Role) [Fri, 14 Apr 2017 20:10:55 +0000 (20:10 +0000)]
Merge "Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am:
2c42db20e4 -s ours am:
812594f573 am:
45bd03914c -s ours" into oc-dev-plus-aosp
Andrew Zeng [Fri, 14 Apr 2017 20:09:46 +0000 (20:09 +0000)]
Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am:
2c42db20e4 -s ours am:
812594f573
am:
45bd03914c -s ours
Change-Id: Iadf1027f7bc9d9bc31264341cb6797ae241882fd
Andrew Zeng [Fri, 14 Apr 2017 20:08:35 +0000 (20:08 +0000)]
Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am:
2c42db20e4 -s ours am:
812594f573 -s ours
am:
d210ce63d0
Change-Id: Ic2932b7fd206c72de0fe78fd604effd8603cc8e7
Andrew Zeng [Fri, 14 Apr 2017 20:03:20 +0000 (20:03 +0000)]
Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am:
2c42db20e4 -s ours
am:
812594f573 -s ours
Change-Id: I54ee864eadfe657ab560c6490a23227532d96b0c
Andrew Zeng [Fri, 14 Apr 2017 20:02:57 +0000 (20:02 +0000)]
Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am:
2c42db20e4 -s ours
am:
812594f573
Change-Id: Ifb03ad1b13aa59e18ff658f6a0a5779d42d1d226
Andrew Zeng [Fri, 14 Apr 2017 19:52:58 +0000 (19:52 +0000)]
Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev
am:
2c42db20e4 -s ours
Change-Id: I1c4ddbf044df414cffa282d9e9aba4261b23a975
Philip P. Moltmann [Tue, 11 Apr 2017 17:13:33 +0000 (10:13 -0700)]
Fix some racines in AutofillManager
- The session might be gone by the time the handler is called, hence check
the sessionID
- Access getClientLocked() and mSession only under mLock.
Test: cts-tradefed run cts-dev AutoFillServiceTestsCases
Change-Id: I445a24557589afadb1f5372b63ef9db88021b609
Andrew Zeng [Fri, 14 Apr 2017 19:40:51 +0000 (19:40 +0000)]
Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev
Adrian Roos [Fri, 14 Apr 2017 19:35:31 +0000 (19:35 +0000)]
Merge "Sysui Leaks: Leak check destroyed fragments" into oc-dev
am:
b160141698
Change-Id: I22c165cb1a366e967bebf369ed79eaf86da995a4
TreeHugger Robot [Fri, 14 Apr 2017 19:24:36 +0000 (19:24 +0000)]
Merge "Sysui Leaks: Leak check destroyed fragments" into oc-dev
Android Build Merger (Role) [Fri, 14 Apr 2017 19:10:49 +0000 (19:10 +0000)]
Merge "Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev am:
28dab313ee" into oc-dev-plus-aosp
Christopher Tate [Fri, 14 Apr 2017 19:09:27 +0000 (19:09 +0000)]
Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev
am:
28dab313ee
Change-Id: I369ba9ee166d4812f2df929903691352e7bafe11
Hall Liu [Fri, 14 Apr 2017 19:06:37 +0000 (19:06 +0000)]
Merge "Helper method in VideoCallImpl for testing" am:
14d27fccad am:
8fa1c9c899
am:
00cf4637d2
Change-Id: I257f3ed9143f8d35202f461a0e2522f65c30177b
TreeHugger Robot [Fri, 14 Apr 2017 19:04:30 +0000 (19:04 +0000)]
Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev
Jason Monk [Mon, 10 Apr 2017 19:01:27 +0000 (15:01 -0400)]
Convert signal icon to be custom drawable
This will make it really easy to change the number of bars it
displays.
Test: runtest systemui
Change-Id: If0b8a606f56430ea08fa0887af85aa0e90de1d40
Fixes:
35902355
Julia Reynolds [Fri, 14 Apr 2017 18:56:18 +0000 (18:56 +0000)]
Merge "Synchronize access to ranking helper records." into oc-dev
am:
bf777d46f2
Change-Id: I36dec49a567400d1acf6e13567de3f76319f91be
TreeHugger Robot [Fri, 14 Apr 2017 18:52:36 +0000 (18:52 +0000)]
Merge "Synchronize access to ranking helper records." into oc-dev
Hall Liu [Fri, 14 Apr 2017 18:43:19 +0000 (18:43 +0000)]
Merge "Helper method in VideoCallImpl for testing" am:
14d27fccad
am:
8fa1c9c899
Change-Id: I148108bcf8636d553852201b0a70e9cfc97d7d44
Hall Liu [Fri, 14 Apr 2017 18:39:18 +0000 (18:39 +0000)]
Merge "Helper method in VideoCallImpl for testing"
am:
14d27fccad
Change-Id: I5e298b40a83041d759e9e5c59d51be0ec5450d11
Julia Reynolds [Fri, 14 Apr 2017 18:34:01 +0000 (18:34 +0000)]
Merge "Lock access to managed services." into oc-dev
am:
8ac1452288
Change-Id: I425a6ee8a3f89149e87ce8269d679acc27363793
Hall Liu [Fri, 14 Apr 2017 18:30:25 +0000 (18:30 +0000)]
Merge "Helper method in VideoCallImpl for testing"
Matt Sarett [Fri, 14 Apr 2017 18:29:16 +0000 (18:29 +0000)]
Merge "Bug fix: use legacy SkCanvas regardless of color space tag" into oc-dev
am:
101dc265a8
Change-Id: Ia6d620a6f4df4e7fdbceae5a6f3bc524aae4358e
TreeHugger Robot [Fri, 14 Apr 2017 18:28:31 +0000 (18:28 +0000)]
Merge "Lock access to managed services." into oc-dev
TreeHugger Robot [Fri, 14 Apr 2017 18:21:41 +0000 (18:21 +0000)]
Merge "Bug fix: use legacy SkCanvas regardless of color space tag" into oc-dev
Tsukasa Hashimoto [Fri, 14 Apr 2017 18:19:22 +0000 (18:19 +0000)]
Merge "Add PID info into ANR crash log header" am:
2fe972c822 am:
5d57502c89
am:
5dbe26f0f1
Change-Id: I692162bdee8a93d49cd41967939aaab9f4c33224
Tsukasa Hashimoto [Fri, 14 Apr 2017 18:13:50 +0000 (18:13 +0000)]
Merge "Add PID info into ANR crash log header" am:
2fe972c822
am:
5d57502c89
Change-Id: I5fc92088c55fed713716ea516a3b22e7cf00fcb0
Vikas Marwaha [Fri, 14 Apr 2017 18:13:49 +0000 (18:13 +0000)]
Merge "Make android.intent.action.MASTER_CLEAR depreciation explicit" into oc-dev
am:
e768104f9b
Change-Id: Ica12fabb8ab667da444cb70a54dafa26225a1458
Tsukasa Hashimoto [Fri, 14 Apr 2017 18:09:56 +0000 (18:09 +0000)]
Merge "Add PID info into ANR crash log header"
am:
2fe972c822
Change-Id: Ib7ec151a3a4b1759022a9a663836a73087ea85ec
Vikas Marwaha [Fri, 14 Apr 2017 18:06:18 +0000 (18:06 +0000)]
Merge "Make android.intent.action.MASTER_CLEAR depreciation explicit" into oc-dev
Treehugger Robot [Fri, 14 Apr 2017 18:03:11 +0000 (18:03 +0000)]
Merge "Add PID info into ANR crash log header"
Wale Ogunwale [Fri, 14 Apr 2017 17:41:52 +0000 (17:41 +0000)]
Merge "Move stack to front in-sync with task reparenting" into oc-dev
am:
c4555784be
Change-Id: Ia9ea6523bb84c8ca4fbdd02da888a3ffef8dc543
Svet Ganov [Fri, 14 Apr 2017 17:40:40 +0000 (17:40 +0000)]
Fix NPE in autofill
am:
833c68e9fd
Change-Id: Iabfff7d35836149e3b823ff7bb05fdaf555c0ea4
Wale Ogunwale [Fri, 14 Apr 2017 17:32:59 +0000 (17:32 +0000)]
Merge "Move stack to front in-sync with task reparenting" into oc-dev
Svet Ganov [Fri, 14 Apr 2017 17:11:46 +0000 (10:11 -0700)]
Fix NPE in autofill
Test: manual
bug:
37330744
Change-Id: I110ece0b9283adb9998f8df795e2107da772482e
Daniel Nishi [Fri, 14 Apr 2017 17:18:40 +0000 (17:18 +0000)]
Merge "Revert "Use the StorageStatsManager in FileCollector."" into oc-dev
am:
864d53d6fc
Change-Id: I21cf2b0a245cfeaf0c788b3c869b441776ec5d0c
Romain Guy [Fri, 14 Apr 2017 01:43:42 +0000 (18:43 -0700)]
Add BitmapFactory.Options.inColorSpace
This allows applications to load bitmap in a preferred
target color space, similar to inPreferredConfig for
configurations.
This change also applies recent changes made to BitmapFactory
to BitmapRegionDecoder: support for outColorSpace, inColorSpace
and outConfig.
Bug:
32984164,
36905374
Test: CtsGraphicsTestCase (BitmapColorSpaceTest/BitmapRegionDecoderTest)
Change-Id: I4eded9190d1aa9c7f3033f9bb78a6854cc48a3ef
Dongwon Kang [Fri, 14 Apr 2017 17:13:49 +0000 (17:13 +0000)]
Merge "TIF: add ASPECT_RATIO_4_3 for Preview/WatchNextPrograms" into oc-dev
am:
0cdc7c8874
Change-Id: I6d6f9739809aa04ae4f9a23a7d401df990226ded
Daniel Nishi [Fri, 14 Apr 2017 17:11:26 +0000 (17:11 +0000)]
Merge "Revert "Use the StorageStatsManager in FileCollector."" into oc-dev
Julia Reynolds [Fri, 14 Apr 2017 16:29:04 +0000 (12:29 -0400)]
Synchronize access to ranking helper records.
Fixes:
36282438
Test: fix is mostly hypothetical. did try clearing data
on a lot of apps while a backup was in process.
Change-Id: I58977a972d187bce2c013d55a95298b23bc0eda8
Dongwon Kang [Fri, 14 Apr 2017 17:05:26 +0000 (17:05 +0000)]
Merge "TIF: add ASPECT_RATIO_4_3 for Preview/WatchNextPrograms" into oc-dev
Alan Viverette [Fri, 14 Apr 2017 17:04:19 +0000 (17:04 +0000)]
Merge "Remove unnecessary casts on calls to findViewById" into oc-dev
am:
7c8ab2651b
Change-Id: I82826b63a3d6bc527c696158bfab98fe438f9847
Julia Reynolds [Fri, 14 Apr 2017 14:01:24 +0000 (10:01 -0400)]
Lock access to managed services.
Fixes:
35873807
Test: manual, set a notification to enqueue once a second for a few
minutes while also repeatedly granting and denying notification listener
access to a couple of apps in Settings and verifying
that nothing crashes and log is clean.
Change-Id: I15f429d61bf5f9ad639e524a94288a6d2db2cb56
TreeHugger Robot [Fri, 14 Apr 2017 16:56:23 +0000 (16:56 +0000)]
Merge "Remove unnecessary casts on calls to findViewById" into oc-dev
Wale Ogunwale [Fri, 14 Apr 2017 16:45:27 +0000 (09:45 -0700)]
Move stack to front in-sync with task reparenting
When reparenting a task to another stack have window manager move the
destination stack to the front at the same time it is reparenting the
task if REPARENT_MOVE_STACK_TO_FRONT is set to avoid jank.
Test: manual
Bug:
37299899
Change-Id: I45678e742188a4871f93a11178f7ab2b60c7bcc3
Alan Viverette [Fri, 14 Apr 2017 16:33:14 +0000 (16:33 +0000)]
Merge "Update more implementations of findViewById()" into oc-dev
am:
b7f0db8d89
Change-Id: Iaa7a100c54305623e908ec325575d936ecbaf26a
Matt Sarett [Thu, 13 Apr 2017 16:18:47 +0000 (12:18 -0400)]
Bug fix: use legacy SkCanvas regardless of color space tag
Test: Added unit test. CtsGraphicsModule.
Bug:
32984164
Change-Id: If72e1e31c98e01f97f3a05d763f5d4c71cf88313
TreeHugger Robot [Fri, 14 Apr 2017 16:26:20 +0000 (16:26 +0000)]
Merge "Update more implementations of findViewById()" into oc-dev
Chad Brubaker [Fri, 14 Apr 2017 16:14:24 +0000 (16:14 +0000)]
Merge "Implicitly expose SEND intents to Instant Apps" into oc-dev
am:
8ee12087e6
Change-Id: I3f02d7e1b8dfba220fca62cea406650ed7851570
Chad Brubaker [Fri, 14 Apr 2017 16:07:11 +0000 (16:07 +0000)]
Merge "Implicitly expose SEND intents to Instant Apps" into oc-dev
Hugo Benichi [Fri, 14 Apr 2017 15:36:10 +0000 (15:36 +0000)]
Merge "ConnectivityManager: release all requests mapping to a callback." am:
1a8f04b1b2 am:
4d80366762
am:
e505b37ec5
Change-Id: I99267e14ab04ce62c5c2385f24f5865e791a24a0
Hugo Benichi [Fri, 14 Apr 2017 15:29:09 +0000 (15:29 +0000)]
Merge "ConnectivityManager: release all requests mapping to a callback." am:
1a8f04b1b2
am:
4d80366762
Change-Id: I8c5d3fba8aaa19e8ffd1146ddb68c4279140f921
Seigo Nonaka [Fri, 14 Apr 2017 15:24:10 +0000 (15:24 +0000)]
Merge "Use provided style for fallback font selection" into oc-dev
am:
43112fd26e
Change-Id: I15c19e1f5ff7919895af967f3ebf2d9564e0ce89
Hugo Benichi [Fri, 14 Apr 2017 15:22:39 +0000 (15:22 +0000)]
Merge "ConnectivityManager: release all requests mapping to a callback."
am:
1a8f04b1b2
Change-Id: I30d3790822430d250d6005cc165e7fa10f56649e
Alan Viverette [Wed, 5 Apr 2017 14:00:01 +0000 (10:00 -0400)]
Remove unnecessary casts on calls to findViewById
Just frameworks/ this time. More paths to come.
Bug:
24137209
Test: make -j32
Change-Id: Iff27abd26fa43296ac2fff8f534fc6742d2ae80c
Seigo Nonaka [Fri, 14 Apr 2017 15:13:12 +0000 (15:13 +0000)]
Merge "Use provided style for fallback font selection" into oc-dev
Treehugger Robot [Fri, 14 Apr 2017 15:10:08 +0000 (15:10 +0000)]
Merge "ConnectivityManager: release all requests mapping to a callback."
Hugo Benichi [Mon, 6 Mar 2017 00:17:06 +0000 (09:17 +0900)]
ConnectivityManager: release all requests mapping to a callback.
This patch changes how callback unregistration works in order to be
consistent with undocumented use cases currently de-facto supported
by the API (although in a buggy way):
- callback recycling: releasing then reregistering a callback again.
- multiple request registrations with the same callback.
The second use case is not desirable but needs to be taken into account
for now for the purpose of correctly releasing NetworkRequests
registered in ConnectivityService.
In order to support request release in both use cases with minimal
amount of complexity for the time being the following changes are done:
- request to callback unmapping is done synchronously at callback
release time.
- all requests associated to a callback are unmapped at callback
release time.
This fixes the following issues:
- a callback stops being triggered as soon as it is released.
Otherwise when recycling the callback immediately, it is possible
the previous request associated with it triggers it, confusing the
app.
- when a callback is registered multiple times, the requests are not
leaked.
- when a callback is registered multiple times and then released, the
N-1 first registrations do not trigger the callback anymore.
In the future it would be desirable to enforce the intended 1:1 mapping
between callbacks and requests at registration time.
Bug:
35921499,
35955593,
20701525
Test: - added new tests in ConnectivityManagerTest to test releasing,
recycling, and a disabled test for no multiple regristration.
- new tests catch regression causing b/
35921499, b/
35955593.
Change-Id: Ia0917ac322fc049f76adb4743bc745989fed6d26
Hugo Benichi [Fri, 14 Apr 2017 12:34:33 +0000 (12:34 +0000)]
Merge "Captive portal: rotate fallback urls" into oc-dev
am:
a622b24d3a -s ours
Change-Id: I60f1cca6bb834f8f82dd0627c0943f5785a79122
Hugo Benichi [Fri, 14 Apr 2017 12:28:37 +0000 (12:28 +0000)]
Merge "Captive portal: rotate fallback urls" into oc-dev
Jorim Jaggi [Fri, 14 Apr 2017 12:02:08 +0000 (12:02 +0000)]
Merge "Implement new splash screen API" into oc-dev
am:
46ae660bf2
Change-Id: I2f12289fcf82754a46365d0342997ae7bf59a2f8
TreeHugger Robot [Fri, 14 Apr 2017 11:54:38 +0000 (11:54 +0000)]
Merge "Implement new splash screen API" into oc-dev
Andrew Scull [Fri, 14 Apr 2017 11:43:03 +0000 (11:43 +0000)]
Merge "Service for OEM lock management." into oc-dev
am:
e52a1bfede
Change-Id: I074e29147417d6a358fd97e7e60cd4cfbed5c4df
Andrew Scull [Fri, 14 Apr 2017 11:31:00 +0000 (11:31 +0000)]
Merge "Service for OEM lock management." into oc-dev
Svet Ganov [Fri, 14 Apr 2017 10:01:13 +0000 (10:01 +0000)]
Add back an id used by CTS
am:
3de36a3cc1
Change-Id: I4c7ad8ad12f555cf6244092498da471043dbdb9f
Hugo Benichi [Mon, 10 Apr 2017 08:43:08 +0000 (17:43 +0900)]
Captive portal: rotate fallback urls
This patch introduces a new settings value to specify more than one url
for the fallback http probe in addition to the existing settings value.
If more than one url exists, a network will rotate urls for the fallback
probe one by one everytime the fallback probe is sent.
Test: built, flashed, tested manually with various portal networks.
Bug:
36532213
Merged-In: I3c010bfee5b99db03a500776fbf47959a29d0578
(cherry picked from commit
eef918a66c984ac7bb1f541665f4dc9bb88ea7ac)
Change-Id: If4d9a091c3a04a33895032d9b0d05c1dc66968e7
Svet Ganov [Fri, 14 Apr 2017 07:17:12 +0000 (00:17 -0700)]
Add back an id used by CTS
Test: tests can find the autofill dropdown
Change-Id: I4361960b4a12e02b06cca1e3112e4679cd6e484d
Casey Burkhardt [Fri, 14 Apr 2017 07:48:19 +0000 (07:48 +0000)]
Merge "Icon assets for magnification" into oc-dev
am:
4d386d5ce7
Change-Id: I2d75a1bdbaff4ec53b7c7a903374932e092de2cf
Jakub Pawlowski [Fri, 14 Apr 2017 07:47:10 +0000 (07:47 +0000)]
Bluetooth 5 PHY simplification
am:
a51513747a
Change-Id: I01dc8b494069bb8a1c19ac6ba8aefb5029b991b3
TreeHugger Robot [Fri, 14 Apr 2017 07:41:37 +0000 (07:41 +0000)]
Merge "Icon assets for magnification" into oc-dev
Jakub Pawlowski [Wed, 12 Apr 2017 15:51:22 +0000 (08:51 -0700)]
Bluetooth 5 PHY simplification
Having PHY_LE_* constants defined in four different places, with one
value being different than others is misleading. Leave just PHY_LE_*
definitions in BluetoothDevice, and add PHY_LE*_MASK for the mask used
in PHY update API.
This patch also removes need to translate PHY value between PHY update
request and event, as mask is used for request, and the value is
returned in event.
Bug:
30622771
Test: manual
Change-Id: I897effa1204a024465d55501c83c542566c4d37c
(cherry picked from commit
9e377194e35c0fb9ac5771f5658c095ed97e0838)
Hugo Benichi [Fri, 14 Apr 2017 07:07:46 +0000 (07:07 +0000)]
Merge "Captive portal: rotate fallback urls" am:
76b3537dfd am:
605eafe0a5
am:
4479901ff3
Change-Id: I7d20b9f247a30920df1938b680e63bc1739e1fa9
Hugo Benichi [Fri, 14 Apr 2017 07:00:41 +0000 (07:00 +0000)]
Merge "Captive portal: rotate fallback urls" am:
76b3537dfd
am:
605eafe0a5
Change-Id: I456d8a2af20dc2fa1553e0e27ec0280380ae6f38
Hugo Benichi [Fri, 14 Apr 2017 06:54:10 +0000 (06:54 +0000)]
Merge "Captive portal: rotate fallback urls"
am:
76b3537dfd
Change-Id: I5583659f2f79cf5d42e7825dfbda875ce359ddb0
Treehugger Robot [Fri, 14 Apr 2017 06:41:07 +0000 (06:41 +0000)]
Merge "Captive portal: rotate fallback urls"
Jorim Jaggi [Fri, 14 Apr 2017 05:34:38 +0000 (05:34 +0000)]
Merge "Make sure theme attributes don't get lost" into oc-dev
am:
9d2f03ec5d
Change-Id: I4a2d163e18ce899eb97bfcff7c92de3a7ffb186c
TreeHugger Robot [Fri, 14 Apr 2017 05:24:41 +0000 (05:24 +0000)]
Merge "Make sure theme attributes don't get lost" into oc-dev
Winson Chung [Fri, 14 Apr 2017 05:22:04 +0000 (05:22 +0000)]
Merge "Fix issue where we weren't dismissing the pip menu activity." into oc-dev
am:
2e86be7653
Change-Id: Idec10c8c0aadccabcd639b5a02e426dc677b9f14
Romain Guy [Fri, 14 Apr 2017 05:20:55 +0000 (05:20 +0000)]
Merge "Fix javadoc typos" into oc-dev
am:
4b6e82d237
Change-Id: I03e9608a10deb04d3821bf411c033300bb6272ee
Andrii Kulian [Fri, 14 Apr 2017 05:17:33 +0000 (05:17 +0000)]
Merge "Hide flag SHOW_WITH_INSECURE_KEYGUARD" into oc-dev
am:
c66b6ff997
Change-Id: I1db901364853ceb5eaec1ac757fd6974db7ea2a9
Winson Chung [Fri, 14 Apr 2017 05:12:50 +0000 (05:12 +0000)]
Merge "Fix issue where we weren't dismissing the pip menu activity." into oc-dev
TreeHugger Robot [Fri, 14 Apr 2017 05:06:39 +0000 (05:06 +0000)]
Merge "Fix javadoc typos" into oc-dev
Andrii Kulian [Fri, 14 Apr 2017 05:05:19 +0000 (05:05 +0000)]
Merge "Hide flag SHOW_WITH_INSECURE_KEYGUARD" into oc-dev
Jesse Evans [Fri, 14 Apr 2017 04:56:33 +0000 (04:56 +0000)]
Merge "Fix instant app filtering in ApplicationsState" into oc-dev
am:
9bdaa9c9fa
Change-Id: I1f3b4dfe6c6f9f53c9af5483ab4b31726026d219
Winson Chung [Fri, 14 Apr 2017 04:50:03 +0000 (04:50 +0000)]
Merge changes I789945c1,I532b0928,I62c6df8b,Ib2bd81ad into oc-dev
am:
4191d99614
Change-Id: I257467c0f950af3a1b27bbff21e466323babe513