OSDN Git Service
Jerry Zhang [Thu, 17 Nov 2016 00:37:01 +0000 (00:37 +0000)]
Fixed handling of usb state during adb changes. am:
0269ebe0fe am:
4389cb6c9a
am:
dbcbadbb99
Change-Id: Ia923cadf6131f4feeeff5b3d90ba0701c6ea8622
Jerry Zhang [Thu, 17 Nov 2016 00:22:53 +0000 (00:22 +0000)]
Fixed handling of usb state during adb changes. am:
0269ebe0fe
am:
4389cb6c9a
Change-Id: Ie93d9df3fad63ba937b3069695744d5cadd2796c
Jerry Zhang [Thu, 17 Nov 2016 00:10:25 +0000 (00:10 +0000)]
Fixed handling of usb state during adb changes.
am:
0269ebe0fe
Change-Id: I2fc3674c4d5cc63febe2ebf47576f3cf1bcd1da2
Ningyuan Wang [Thu, 17 Nov 2016 00:08:51 +0000 (00:08 +0000)]
Merge "Add security capabilities enums to ScanResult" am:
a3c0324824 am:
6e67bb87cf
am:
7cad272109
Change-Id: I2767e6465c125dd19e07af5d20ae4c23b3c8d1b1
Ningyuan Wang [Thu, 17 Nov 2016 00:01:23 +0000 (00:01 +0000)]
Merge "Add security capabilities enums to ScanResult" am:
a3c0324824
am:
6e67bb87cf
Change-Id: I02934a0a018bf759559d710f2edff1abe49df2cd
Ningyuan Wang [Wed, 16 Nov 2016 23:54:24 +0000 (23:54 +0000)]
Merge "Add security capabilities enums to ScanResult"
am:
a3c0324824
Change-Id: Iad2aba87155d52343b372b2d7af3e037842c1ca4
Treehugger Robot [Wed, 16 Nov 2016 23:42:24 +0000 (23:42 +0000)]
Merge "Add security capabilities enums to ScanResult"
Fei Wu [Wed, 16 Nov 2016 21:25:39 +0000 (21:25 +0000)]
Merge "Update colorPrimary in watch" into cw-f-dev am:
447fff8589
am:
eb70bc0d36
Change-Id: I5461cbaa37378dfa11043ed4b7fa33d72ce5955f
FEI WU [Wed, 16 Nov 2016 21:24:23 +0000 (21:24 +0000)]
Update colorPrimary in watch am:
9072dcd82c
am:
78fef4c065
Change-Id: I586f1de9d0d8c3860807c3209dba4758e3bd4701
Fei Wu [Wed, 16 Nov 2016 21:15:41 +0000 (21:15 +0000)]
Merge "Update colorPrimary in watch" into cw-f-dev
am:
447fff8589
Change-Id: I0e021db6fe386b0ca7a05db97add2e7f36e85b05
FEI WU [Wed, 16 Nov 2016 21:15:38 +0000 (21:15 +0000)]
Update colorPrimary in watch
am:
9072dcd82c
Change-Id: I3a869e0acddb6d0494e352bfb7e926e897105f08
Fei Wu [Wed, 16 Nov 2016 21:05:24 +0000 (21:05 +0000)]
Merge "Update colorPrimary in watch" into cw-f-dev
Yifan Hong [Wed, 16 Nov 2016 19:24:09 +0000 (19:24 +0000)]
Merge "Fix include after spliting HidlSupport.h" am:
efd7b9f57d am:
2f7a3f9595
am:
afe46992b8
Change-Id: If9b589ef262ae97e85dc851bd1a5f3fe3d4c22fa
Yifan Hong [Wed, 16 Nov 2016 19:16:45 +0000 (19:16 +0000)]
Merge "Fix include after spliting HidlSupport.h" am:
efd7b9f57d
am:
2f7a3f9595
Change-Id: Id85f0bb5b53ca3a693ab1bf137627159b6d382d5
Ningyuan Wang [Tue, 1 Nov 2016 22:36:10 +0000 (15:36 -0700)]
Add security capabilities enums to ScanResult
This adds enums of security parameters, including
protocol, key management, and cipher suites.
Bug:
32512793
Test: compile
Change-Id: Ibf784d79695ca5e261c6bfe623406bc693c5ac17
Yifan Hong [Wed, 16 Nov 2016 19:10:20 +0000 (19:10 +0000)]
Merge "Fix include after spliting HidlSupport.h"
am:
efd7b9f57d
Change-Id: I6b0b3482feb169ae89ffa6e20561ad64b42d12d1
Yifan Hong [Wed, 16 Nov 2016 19:01:00 +0000 (19:01 +0000)]
Merge "Fix include after spliting HidlSupport.h"
Andreas Gampe [Wed, 16 Nov 2016 18:40:08 +0000 (18:40 +0000)]
Merge "Preload2: Fix dependencies" am:
3b379ee94e am:
74b4e070be
am:
6a454c86db
Change-Id: Id214d7386401495981a75acb5a7b4a91a220e6a6
Andreas Gampe [Wed, 16 Nov 2016 18:32:56 +0000 (18:32 +0000)]
Merge "Preload2: Fix dependencies" am:
3b379ee94e
am:
74b4e070be
Change-Id: I6bbc33352648a352ed8be54bb3cb2eb9e065f074
Andreas Gampe [Wed, 16 Nov 2016 18:25:37 +0000 (18:25 +0000)]
Merge "Preload2: Fix dependencies"
am:
3b379ee94e
Change-Id: If3ecad631e5f7deb9b2f348a26d9b41f8a00b4f5
Treehugger Robot [Wed, 16 Nov 2016 18:15:05 +0000 (18:15 +0000)]
Merge "Preload2: Fix dependencies"
Martijn Coenen [Wed, 16 Nov 2016 10:19:30 +0000 (10:19 +0000)]
Merge "Fix deprecated range_x calls." am:
87cafe8f33 am:
d03b17c29a
am:
6e2c276c78
Change-Id: I6511ef9ccc352c43c7fa5924e1246449be7c3a0e
Martijn Coenen [Wed, 16 Nov 2016 10:07:54 +0000 (10:07 +0000)]
Merge "Fix deprecated range_x calls." am:
87cafe8f33
am:
d03b17c29a
Change-Id: I70280eb85b9430c23f6b2681375cbcfa9da2dd38
Martijn Coenen [Wed, 16 Nov 2016 10:00:23 +0000 (10:00 +0000)]
Merge "Fix deprecated range_x calls."
am:
87cafe8f33
Change-Id: Idfbc4e3475cea7e56b3ac72afd61e1e981ef4e5d
Martijn Coenen [Wed, 16 Nov 2016 09:48:30 +0000 (09:48 +0000)]
Merge "Fix deprecated range_x calls."
Hidenari Koshimae [Wed, 16 Nov 2016 08:26:00 +0000 (08:26 +0000)]
Merge "CountDownTimer: not skip onTick()" am:
224d9e48fa am:
9997fcc72c
am:
9f0cc266ce
Change-Id: I75127bfd0fc4ce9256c775eaeb46582afd637e8d
Hidenari Koshimae [Wed, 16 Nov 2016 08:18:30 +0000 (08:18 +0000)]
Merge "CountDownTimer: not skip onTick()" am:
224d9e48fa
am:
9997fcc72c
Change-Id: Ie09949fbc23ad87e159e063a59983a1a6bff98f8
Hidenari Koshimae [Wed, 16 Nov 2016 08:10:54 +0000 (08:10 +0000)]
Merge "CountDownTimer: not skip onTick()"
am:
224d9e48fa
Change-Id: I7ade5d057e73f53867747c00fcfc5882a57a2f4c
Treehugger Robot [Wed, 16 Nov 2016 07:55:26 +0000 (07:55 +0000)]
Merge "CountDownTimer: not skip onTick()"
longhai [Wed, 16 Nov 2016 03:18:08 +0000 (03:18 +0000)]
Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA." am:
1813ae0159 am:
2be54fde72
am:
5c152a3d7f
Change-Id: Ida06ea3d42d66cb2f1cc124fe3498e579141d16c
longhai [Wed, 16 Nov 2016 03:11:09 +0000 (03:11 +0000)]
Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA." am:
1813ae0159
am:
2be54fde72
Change-Id: I14e1d5aa6bda143e2a87bba1ea65b8384c44e3a1
longhai [Wed, 16 Nov 2016 03:04:38 +0000 (03:04 +0000)]
Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA."
am:
1813ae0159
Change-Id: Iae1a0cd25495206d596aed7d68ce7936071f9c6e
Treehugger Robot [Wed, 16 Nov 2016 02:54:25 +0000 (02:54 +0000)]
Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA."
Peter Qiu [Wed, 16 Nov 2016 00:29:39 +0000 (00:29 +0000)]
Merge changes from topic 'HS2 API Cleanup' am:
41fd0f1faf am:
afb8f37711
am:
2e73b06f63
Change-Id: I0be82ec64a61f015a34ded70202c422e43825778
Peter Qiu [Wed, 16 Nov 2016 00:27:34 +0000 (00:27 +0000)]
wifi: remove unused hidden Hotspot 2.0 Release 1 API am:
1c3054ea87 am:
1b39c61ce7
am:
134706940b
Change-Id: If04a8f9005b69b9f4f38c2e0ea38b7bc6162397e
Peter Qiu [Wed, 16 Nov 2016 00:26:28 +0000 (00:26 +0000)]
wifi: remove hidden unused Hotspot 2.0 Release 2 APIs am:
a38558b539 am:
a9a9a9bb8d
am:
31b8e658d3
Change-Id: Ifce7abfb578e5b7d0a3d5c964926537e16ef3a2b
Peter Qiu [Wed, 16 Nov 2016 00:18:36 +0000 (00:18 +0000)]
Merge changes from topic 'HS2 API Cleanup' am:
41fd0f1faf
am:
afb8f37711
Change-Id: I413a4e86233f103767c24b636212faf3fba3dcf9
Peter Qiu [Wed, 16 Nov 2016 00:16:30 +0000 (00:16 +0000)]
wifi: remove unused hidden Hotspot 2.0 Release 1 API am:
1c3054ea87
am:
1b39c61ce7
Change-Id: Ia81a0d8b77a6031670b89f97d21fc29be9631fb3
Peter Qiu [Wed, 16 Nov 2016 00:14:46 +0000 (00:14 +0000)]
wifi: remove hidden unused Hotspot 2.0 Release 2 APIs am:
a38558b539
am:
a9a9a9bb8d
Change-Id: I5be1220539e5a22e4f0d4e3d52ac85c608ccb950
Peter Qiu [Wed, 16 Nov 2016 00:04:44 +0000 (00:04 +0000)]
Merge changes from topic 'HS2 API Cleanup'
am:
41fd0f1faf
Change-Id: Ic53fa2cad082484ebbbc9198511b0539dad97382
Yifan Hong [Wed, 16 Nov 2016 00:02:40 +0000 (16:02 -0800)]
Fix include after spliting HidlSupport.h
Test: mma
Bug:
32756130
Change-Id: Ia4fa02726d79681753fe9c8c7135a28fffb508b4
Peter Qiu [Wed, 16 Nov 2016 00:00:06 +0000 (00:00 +0000)]
wifi: remove unused hidden Hotspot 2.0 Release 1 API
am:
1c3054ea87
Change-Id: I5a13979aedb39ad347099fd25e7515b099b9ac19
Peter Qiu [Tue, 15 Nov 2016 23:59:20 +0000 (23:59 +0000)]
wifi: remove hidden unused Hotspot 2.0 Release 2 APIs
am:
a38558b539
Change-Id: I48766f0c259693496dc9b63ad0dd287b93185787
Treehugger Robot [Tue, 15 Nov 2016 23:50:16 +0000 (23:50 +0000)]
Merge changes from topic 'HS2 API Cleanup'
* changes:
wifi: remove unused hidden Hotspot 2.0 Release 1 API
wifi: remove hidden unused Hotspot 2.0 Release 2 APIs
Jerry Zhang [Thu, 13 Oct 2016 01:04:03 +0000 (18:04 -0700)]
Fixed handling of usb state during adb changes.
When changing state to adb from mtp (charging), we want to disable
the old mtp function. Similarly when change to away from adb to
charging, enable the mtp function.
Also the mtp function should never be persisted.
Bug:
31818377
Bug:
31814300
Test: Manually verify that the correct usb configuration is displayed.
Test: Manually verify that logcat is not kicked during boot.
Change-Id: Idcb7f53be39ea38712d5de45b323d8daeb552129
(cherry-picked from commit
58018d01a3c384b954275d15bee7f9c52a1c7c0a)
Selim Gurun [Tue, 15 Nov 2016 20:15:24 +0000 (20:15 +0000)]
Merge "Fix WebViewDatabase javadoc." into nyc-mr2-dev
am:
83fbb94e18
Change-Id: I6b7b1e04b00835ad2fde2d6d6b4b0dd6f3f81425
Hui Shu [Tue, 15 Nov 2016 20:15:17 +0000 (20:15 +0000)]
Fix WebViewDatabase javadoc.
am:
68d2cc180f
Change-Id: I811966bc364697f5c172cd9b4153d963962d8db2
Selim Gurun [Tue, 15 Nov 2016 19:57:38 +0000 (19:57 +0000)]
Merge "Fix WebViewDatabase javadoc." into nyc-mr2-dev
Neil Fuller [Tue, 15 Nov 2016 17:04:37 +0000 (17:04 +0000)]
Merge "Correctly handle when the user has no explicit time_12_24 setting" am:
8631e19d38 am:
98f03f4980
am:
ef34053f26
Change-Id: I3724485cc956b2d5a64a6e71f325181d5fdbcccf
Neil Fuller [Tue, 15 Nov 2016 16:57:32 +0000 (16:57 +0000)]
Merge "Correctly handle when the user has no explicit time_12_24 setting" am:
8631e19d38
am:
98f03f4980
Change-Id: Ia6592370da446e43896fb56d12f734841e137d49
Neil Fuller [Tue, 15 Nov 2016 16:50:29 +0000 (16:50 +0000)]
Merge "Correctly handle when the user has no explicit time_12_24 setting"
am:
8631e19d38
Change-Id: I70533c5ff4ac8cdeef1b42337bb47b09c8bbf927
Neil Fuller [Tue, 15 Nov 2016 16:39:42 +0000 (16:39 +0000)]
Merge "Correctly handle when the user has no explicit time_12_24 setting"
Julia Reynolds [Tue, 15 Nov 2016 14:13:23 +0000 (14:13 +0000)]
Merge "Remove 'until next alarm'." into nyc-mr2-dev
am:
fd5f6e9446
Change-Id: I9cfa68615af9415265955d62a924d8fb9ddb2d80
Julia Reynolds [Tue, 15 Nov 2016 14:13:18 +0000 (14:13 +0000)]
Remove 'until next alarm'.
am:
5edde5f18a
Change-Id: I0f247f52155f78cefe0d2e850e9d5f1ca65dfb42
Julia Reynolds [Tue, 15 Nov 2016 14:06:35 +0000 (14:06 +0000)]
Merge "Remove 'until next alarm'." into nyc-mr2-dev
Martijn Coenen [Mon, 14 Nov 2016 13:56:03 +0000 (14:56 +0100)]
Fix deprecated range_x calls.
Test: builds
Change-Id: I98412e51a54ef9f9e26c72ecd810dcea77aefdbb
Peter Qiu [Tue, 15 Nov 2016 04:30:20 +0000 (04:30 +0000)]
Merge "osu: remove calls to deprecated APIs" am:
e9514808d7 am:
30874ed6ed
am:
0a5b88e286
Change-Id: Ifb54b8061a70851a8989fae30466f87822e05943
Peter Qiu [Tue, 15 Nov 2016 04:23:21 +0000 (04:23 +0000)]
Merge "osu: remove calls to deprecated APIs" am:
e9514808d7
am:
30874ed6ed
Change-Id: I43093bf243cb249ad892bdf94ea9781ca734e239
Peter Qiu [Tue, 15 Nov 2016 04:15:59 +0000 (04:15 +0000)]
Merge "osu: remove calls to deprecated APIs"
am:
e9514808d7
Change-Id: If7c31b7d901ef8cc8561b7f0933d803498105e75
Treehugger Robot [Tue, 15 Nov 2016 03:59:57 +0000 (03:59 +0000)]
Merge "osu: remove calls to deprecated APIs"
Svetoslav Ganov [Tue, 15 Nov 2016 03:41:14 +0000 (03:41 +0000)]
Merge "Add WiFi toggle prompts - framework" into stage-aosp-master am:
9f078049cf
am:
05149e69cb
Change-Id: Ib284befe74e6bca8b3c75e5c33dec1ba23eab898
Svetoslav Ganov [Tue, 15 Nov 2016 03:40:16 +0000 (03:40 +0000)]
Add WiFi toggle prompts - framework am:
6c3032f16b
am:
23328d9714
Change-Id: I629311080b90402a3919dcd3c7b49291800a398b
Svetoslav Ganov [Tue, 15 Nov 2016 03:28:20 +0000 (03:28 +0000)]
Merge "Add WiFi toggle prompts - framework" into stage-aosp-master
am:
9f078049cf
Change-Id: I28501fc58e597c1f5e9d4da6bfaa3a015cad1260
Svetoslav Ganov [Tue, 15 Nov 2016 03:27:22 +0000 (03:27 +0000)]
Add WiFi toggle prompts - framework
am:
6c3032f16b
Change-Id: Ie89a9b91b8b1cd7158a743d8b5870d8f9d6f8adc
Yifan Hong [Tue, 15 Nov 2016 03:19:19 +0000 (03:19 +0000)]
Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods." am:
8cc1343724 am:
2187dc5ca1
am:
41579ea4d4
Change-Id: Ia8f41eb4c76c241088a4cce368409bd61deb5d35
TreeHugger Robot [Tue, 15 Nov 2016 03:18:21 +0000 (03:18 +0000)]
Merge "Add WiFi toggle prompts - framework" into stage-aosp-master
Yifan Hong [Tue, 15 Nov 2016 03:12:43 +0000 (03:12 +0000)]
Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods." am:
8cc1343724
am:
2187dc5ca1
Change-Id: If0919864026c78fed76df1554235c2acca9f2750
Andreas Gampe [Tue, 15 Nov 2016 03:08:22 +0000 (19:08 -0800)]
Preload2: Fix dependencies
Also depend on and package tools-common.
Test: m
Test: preload-tool
Change-Id: I19a8844f87417f2292e50ffaaebb5fa24a2eca24
Yifan Hong [Tue, 15 Nov 2016 03:06:44 +0000 (03:06 +0000)]
Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods."
am:
8cc1343724
Change-Id: If003adc06673d8e6c6db6f8a5d858dcca7aed109
Treehugger Robot [Tue, 15 Nov 2016 02:59:51 +0000 (02:59 +0000)]
Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods."
Svetoslav Ganov [Wed, 27 Jul 2016 01:23:01 +0000 (18:23 -0700)]
Add WiFi toggle prompts - framework
If permission review is enabled toggling WiFi on or off
results in a user prompt to collect a consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.
bug:
28715749
Original-Change-Id: I020601e208c0736005bcabc7b7b77b96eee45b03
Change-Id: I3fdc2b02abecaf3166614b0cb9fac3553cb7ab88
(cherry picked from commit
d3663c04a721e0848dd3e9179c84ba585d91839d)
Peter Qiu [Mon, 14 Nov 2016 23:18:09 +0000 (15:18 -0800)]
osu: remove calls to deprecated APIs
The hidden APIs WifiManager#addPasspointManagmentObject and
WifiManager#addPasspointManagementObject will removed, so remove
all callsites.
The OSU app is still under developement and is not included
in any device builds. However, it is being built by the Treehugger
for generic AOSP builds.
So fix it to allow the API removal CLs to be submitted.
Bug:
32509661
Test: None
Merged-In: Ic405695ee8edfd0c08b831834797f163fe445595
Change-Id: If418c64e69f1836575257b9d5b2f5c4373050a31
Selim Cinek [Tue, 15 Nov 2016 01:32:12 +0000 (01:32 +0000)]
Fixed a bug with the emergency affordance in multi user am:
b8a7f78d24 am:
6cc0b517ba
am:
96d4aadb4c
Change-Id: I46d1527df288330d9daea3f7c843a4b80a4ec468
Selim Cinek [Tue, 15 Nov 2016 01:24:32 +0000 (01:24 +0000)]
Fixed a bug with the emergency affordance in multi user am:
b8a7f78d24
am:
6cc0b517ba
Change-Id: If537b10c1838a47e7662ef56ae08b806fe5d669f
Selim Cinek [Tue, 15 Nov 2016 01:18:35 +0000 (01:18 +0000)]
Fixed a bug with the emergency affordance in multi user
am:
b8a7f78d24
Change-Id: I68fa35dbedb3740eff1c83d03c9c9b5080d3ea81
Selim Cinek [Thu, 3 Nov 2016 21:55:40 +0000 (14:55 -0700)]
Fixed a bug with the emergency affordance in multi user
The emergency call was not launched in the current user
and therefore was only launching once the user had switched.
Change-Id: If6f3bcf77d88a0658b6e0f91f7e4da5d6264b04f
Fixes:
32424103
Test: manual: switch to secondary user and launch emergency affordance
Sohani Rao [Mon, 14 Nov 2016 21:28:08 +0000 (21:28 +0000)]
Merge "Add WiFi toggle prompts - framework" am:
584b5cee49 -s ours am:
31082a0824 -s ours
am:
31264c994c -s ours
Change-Id: I37fe61c02a960ab5024fca8ab025c8e1933d269b
Peter Qiu [Mon, 31 Oct 2016 22:55:15 +0000 (15:55 -0700)]
wifi: remove unused hidden Hotspot 2.0 Release 1 API
WifiManager#buildWifiConfig was used by the Hotspot 2.0 Release 1
app (WifiInstaller) for parsing Release 1 installation data into
a WifiConfiguration object. WifiInstaller will be updated to use
the new framework API (android.net.wifi.hotspot2.ConfigBuilder)
instead. So this API is no longer needed.
Bug:
32509661
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: Iacee739a9ed12ea00b1b7457e22e790ef4a177da
Peter Qiu [Mon, 31 Oct 2016 22:13:35 +0000 (15:13 -0700)]
wifi: remove hidden unused Hotspot 2.0 Release 2 APIs
These APIs are used for installing/modifying the PerProviderSubscription
Management Object tree in XML string representation and are used only by
the unreleased Hotspot 2.0 Release 2 app (OSU app). The OSU app will be
updated to use the new APIs which uses Parcelable objects to represent
provider configuration.
Bug:
32509661
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: Iff6b6e4b95b76d48201eeeb47f441b7c94f359bb
Sohani Rao [Mon, 14 Nov 2016 21:21:38 +0000 (21:21 +0000)]
Merge "Add WiFi toggle prompts - framework" am:
584b5cee49 -s ours
am:
31082a0824 -s ours
Change-Id: Ib2d485f7c6904fc3890c08f34d52703b92d379b5
Sohani Rao [Mon, 14 Nov 2016 21:14:44 +0000 (21:14 +0000)]
Merge "Add WiFi toggle prompts - framework"
am:
584b5cee49 -s ours
Change-Id: I9dd54beb08f771be886c03fa0f8a3335f574c47c
Sohani Rao [Mon, 14 Nov 2016 20:59:35 +0000 (20:59 +0000)]
Merge "Add WiFi toggle prompts - framework"
Sohani Rao [Mon, 14 Nov 2016 19:59:22 +0000 (19:59 +0000)]
Merge "Permissions check for Wifi Display configuration" am:
f5c32a411c am:
7342bb84cd
am:
b4663456d4
Change-Id: I9bfd828577029c3ebb6b89b6830a5c8d72833768
Sohani Rao [Mon, 14 Nov 2016 19:44:46 +0000 (19:44 +0000)]
Merge "Permissions check for Wifi Display configuration" am:
f5c32a411c
am:
7342bb84cd
Change-Id: Iac379dace6fd8b01e5bb80a193f79c65ace1f9b9
Sohani Rao [Mon, 14 Nov 2016 19:33:31 +0000 (19:33 +0000)]
Merge "Permissions check for Wifi Display configuration"
am:
f5c32a411c
Change-Id: I7a1c2d0f48728cd5e056076a2cf1499a7abb2438
Sohani Rao [Mon, 14 Nov 2016 19:21:57 +0000 (19:21 +0000)]
Merge "Permissions check for Wifi Display configuration"
Narayan Kamath [Mon, 14 Nov 2016 19:03:16 +0000 (19:03 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
d9a8ee7598
am:
7521a1b465
Change-Id: I8988c6ef182a55bbd361ccc4db8ffde6297742cb
Narayan Kamath [Mon, 14 Nov 2016 18:56:09 +0000 (18:56 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources.
am:
d9a8ee7598
Change-Id: Ie7c2ec8ec358ce403a0c8afe6305d3164d3892e8
Svetoslav Ganov [Wed, 27 Jul 2016 01:23:01 +0000 (18:23 -0700)]
Add WiFi toggle prompts - framework
If permission review is enabled toggling WiFi on or off
results in a user prompt to collect a consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.
Bug:
28715749
Test: Unit Tests
Change-Id: I020601e208c0736005bcabc7b7b77b96eee45b03
Merged-In: I020601e208c0736005bcabc7b7b77b96eee45b03
Tyler Gunn [Mon, 14 Nov 2016 18:22:14 +0000 (18:22 +0000)]
Merge "Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount." am:
8223dc1ae9 am:
8b58e73c48
am:
9e976c8565
Change-Id: If743a67bff170096f028c7d7f3fc88c8548dfbf1
Sohani Rao [Thu, 29 Sep 2016 23:20:45 +0000 (16:20 -0700)]
Permissions check for Wifi Display configuration
Wifi Display is configured using the AIDL call setMiracastMode()
and using a message over the async channel SET_WFD_INFO.
Enforce permissions on the calling uid before updating the config
Bug:
18668877
Test: Unit tests
Change-Id: I0be2d2af49070aad759f24bd31331f7df39a0422
Merged-In: I0be2d2af49070aad759f24bd31331f7df39a0422
Julia Reynolds [Fri, 11 Nov 2016 19:30:51 +0000 (14:30 -0500)]
Remove 'until next alarm'.
Test: manual
Bug:
32773368
Change-Id: I03db93d9371327a8e32929ce7fda66729cfe4a82
Tyler Gunn [Mon, 14 Nov 2016 18:15:12 +0000 (18:15 +0000)]
Merge "Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount." am:
8223dc1ae9
am:
8b58e73c48
Change-Id: Ifdbfdb2f418297eae83a69196462dc847650e3e2
Tyler Gunn [Mon, 14 Nov 2016 18:08:11 +0000 (18:08 +0000)]
Merge "Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount."
am:
8223dc1ae9
Change-Id: Id8c6077d099f9ef943c09242acb22173b6628c1a
Narayan Kamath [Mon, 14 Nov 2016 17:25:09 +0000 (17:25 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources.
am:
9087f331a8
Change-Id: I800230fd9a4baf543d53834b00019f81aa07bdc9
Narayan Kamath [Fri, 23 Sep 2016 08:07:11 +0000 (09:07 +0100)]
Zygote: Additional whitelists for runtime overlay / other static resources.
Partially cherry picked from commit
1c15c635785c64a.
These files are safe to reopen for the same reason that files in
/system/framework are. They're regular files and will not change after
the first zygote fork.
Bug:
32618130
Change-Id: I119e0bfcbf397cb331064adf148d92a5cd3ea92f
(cherry picked from commit
25cd01cc69fcad34756b00e52a79c0c54178f2e6)
(cherry picked from commit
9087f331a85790d49d1095e1eaf0305b7863e0ba)
Narayan Kamath [Fri, 23 Sep 2016 08:07:11 +0000 (09:07 +0100)]
Zygote: Additional whitelists for runtime overlay / other static resources.
Partially cherry picked from commit
1c15c635785c64a.
These files are safe to reopen for the same reason that files in
/system/framework are. They're regular files and will not change after
the first zygote fork.
Bug:
32618130
Change-Id: I119e0bfcbf397cb331064adf148d92a5cd3ea92f
(cherry picked from commit
25cd01cc69fcad34756b00e52a79c0c54178f2e6)
Tyler Gunn [Mon, 14 Nov 2016 16:23:42 +0000 (16:23 +0000)]
Merge "Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount."
Neil Fuller [Mon, 14 Nov 2016 16:06:42 +0000 (16:06 +0000)]
Correctly handle when the user has no explicit time_12_24 setting
The code would previously interpret "null" (meaning the user
hasn't touched the setting in the Settings app) as meaning
"use 12 hour format". The actual meaning of "null" is
generally accepted in the platform as
"use the locale default". For example, the Settings app does
this, as does the code in libcore.icu.LocaleData. For
locales where the default is "use 12 hour format" anyway
this wasn't obvious. However, locales like Germany should
default to 24 hour, and then the setting is displayed
incorrectly in the Settings app.
Also, German devices boot for the first time with 12 hour SHORT
and MEDIUM time formats too. After the user had explicitly set
the format the setting would be correct.
There appear to be no tests for this behavior, presumably
because of the difficulty in forcing the setting to "unset"
which would have to have to happen before the app was launched,
and the fact that CTS tests run in the US locale.
Bug:
32868036
Test: Manual testing with a device set to German
Change-Id: Ifd2e8d345f6afee467d7525d6793fc8fda37c900
Steven Moreland [Mon, 14 Nov 2016 15:29:39 +0000 (15:29 +0000)]
Merge "hidl: Update for IFoo::descriptor -> const char *." am:
e17e68f139 am:
5f9ac42029
am:
cd0f045eb7
Change-Id: Iecdc2bd4e06fdd8e6b2e2217c8c988dcabceda25
OSDN Git Service
