Billy Lau
5742b87e5c
am 509f2fe5
: am bd5ae865
: am 254ce51b
: am de784e6a
: am 52df60d8
: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev
...
* commit '509f2fe51c84e2c0c2d83770710dc8572d0c2223':
Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
2015-07-14 19:39:17 +00:00
Billy Lau
509f2fe51c
am bd5ae865
: am 254ce51b
: am de784e6a
: am 52df60d8
: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev
...
* commit 'bd5ae86579d7aeebc2cff415f1ed355f269387d5':
Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
2015-07-14 19:23:52 +00:00
Billy Lau
254ce51b12
am de784e6a
: am 52df60d8
: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev
...
* commit 'de784e6ab5e86eb780cdeee4a2f01e2db9a1ef07':
Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
2015-07-14 18:51:58 +00:00
Jorim Jaggi
f79dc2054f
am 983e99dc
: am 07a9d3b3
: am d4391c22
: am 464e54f8
: am 8505d4a5
: Merge "Disable voice input if assist is voice service" into mnc-dev
...
* commit '983e99dcf14b8858071a15f62d870b1561dc9d82':
Disable voice input if assist is voice service
2015-07-14 18:48:39 +00:00
Wei Liu
68e0cf8ee3
am 751d0e67
: am e6023574
: am cfb053f5
: Merge "Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib." into cw-e-dev
...
* commit '751d0e67016c3d5cd25a195d412308e96f87f040':
Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib.
2015-07-14 18:48:38 +00:00
Jason Monk
1ae9f7d754
am aa7a7740
: am b2805789
: am 3aee5d79
: am 19186edd
: am 7713fe26
: Merge "Disable notification volume when user restricted" into mnc-dev
...
* commit 'aa7a7740a16ed03960ea3fd81e5685357594d84a':
Disable notification volume when user restricted
2015-07-14 18:46:49 +00:00
Martijn Coenen
0ebcd356cf
am 9670159d
: am f5f40191
: am bafffd14
: am 35738049
: am 8d9bb1ae
: Merge "Fix up Tap and Pay how it works." into mnc-dev
...
* commit '9670159d46a16a2151ff6f1ca737babf4c7685b0':
Fix up Tap and Pay how it works.
2015-07-14 18:46:48 +00:00
Billy Lau
de784e6ab5
am 52df60d8
: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev
...
* commit '52df60d83dc48818aacbe1721e6aaa9be39e8451':
Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
2015-07-14 18:36:53 +00:00
Jorim Jaggi
983e99dcf1
am 07a9d3b3
: am d4391c22
: am 464e54f8
: am 8505d4a5
: Merge "Disable voice input if assist is voice service" into mnc-dev
...
* commit '07a9d3b3123a0c22b9409f0464b82bc62f7319c9':
Disable voice input if assist is voice service
2015-07-14 18:28:27 +00:00
Wei Liu
751d0e6701
am e6023574
: am cfb053f5
: Merge "Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib." into cw-e-dev
...
* commit 'e60235748c01ee5b7d083b642920006565b08c9a':
Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib.
2015-07-14 18:28:26 +00:00
Billy Lau
52df60d83d
Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev
2015-07-14 18:22:30 +00:00
Jason Monk
aa7a7740a1
am b2805789
: am 3aee5d79
: am 19186edd
: am 7713fe26
: Merge "Disable notification volume when user restricted" into mnc-dev
...
* commit 'b2805789352f60853e087b6886e022724b550645':
Disable notification volume when user restricted
2015-07-14 18:14:54 +00:00
Martijn Coenen
9670159d46
am f5f40191
: am bafffd14
: am 35738049
: am 8d9bb1ae
: Merge "Fix up Tap and Pay how it works." into mnc-dev
...
* commit 'f5f40191a594d192a90c0e3052b78d29146b15ff':
Fix up Tap and Pay how it works.
2015-07-14 18:14:45 +00:00
Jorim Jaggi
d4391c22d1
am 464e54f8
: am 8505d4a5
: Merge "Disable voice input if assist is voice service" into mnc-dev
...
* commit '464e54f88b4aa933a7d26cb1afecf0ddfc282751':
Disable voice input if assist is voice service
2015-07-14 18:13:27 +00:00
Wei Liu
cfb053f590
Merge "Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib." into cw-e-dev
2015-07-14 18:08:35 +00:00
Jorim Jaggi
464e54f88b
am 8505d4a5
: Merge "Disable voice input if assist is voice service" into mnc-dev
...
* commit '8505d4a51d1112ea71f7df680cf85378a9567bde':
Disable voice input if assist is voice service
2015-07-14 18:04:11 +00:00
Jorim Jaggi
8505d4a51d
Merge "Disable voice input if assist is voice service" into mnc-dev
2015-07-14 17:50:34 +00:00
Sanket Padawe
20728bfc35
am ed6c19ae
: am b1167763
: am 389fbb74
: am 2db9291e
: am 7995ca41
: Use same technology type for LTE/4G
...
* commit 'ed6c19aefa6e6c542e957b653d8f6f392a7b0fb6':
Use same technology type for LTE/4G
2015-07-14 16:42:07 +00:00
Chris Wren
c53c63ecd8
am 7734e807
: am 95ac6029
: am 209a72ca
: am b6d8b5f6
: am 2f8bb8ea
: Merge "import new view enums into MetricsLogger" into mnc-dev
...
* commit '7734e807986daa34fa7b8d0d729dc0dd9ea912d4':
import new view enums into MetricsLogger
2015-07-14 16:42:06 +00:00
Zoltan Szatmary-Ban
25b3876b19
am ba79dc4d
: am 0998e03a
: am e4e52064
: am c968c407
: am 098c296d
: Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev
...
* commit 'ba79dc4d32e6fb909732b04b9cec562aa4a762da':
Do not throw exception when MeasurementDetails.mediaSize is empty
2015-07-14 16:42:04 +00:00
Sanket Padawe
ed6c19aefa
am b1167763
: am 389fbb74
: am 2db9291e
: am 7995ca41
: Use same technology type for LTE/4G
...
* commit 'b11677635ad12105e4adc0cae6099713a12371f1':
Use same technology type for LTE/4G
2015-07-14 16:25:24 +00:00
Chris Wren
7734e80798
am 95ac6029
: am 209a72ca
: am b6d8b5f6
: am 2f8bb8ea
: Merge "import new view enums into MetricsLogger" into mnc-dev
...
* commit '95ac602959ce41465ab8e8922659c471a33e7fed':
import new view enums into MetricsLogger
2015-07-14 16:25:20 +00:00
Zoltan Szatmary-Ban
ba79dc4d32
am 0998e03a
: am e4e52064
: am c968c407
: am 098c296d
: Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev
...
* commit '0998e03a8dfa01cf62649e2d277e0b8556b1ffc9':
Do not throw exception when MeasurementDetails.mediaSize is empty
2015-07-14 16:25:17 +00:00
Jason Monk
3aee5d790c
am 19186edd
: am 7713fe26
: Merge "Disable notification volume when user restricted" into mnc-dev
...
* commit '19186edddb32efc43e7f00faea0436c36b702290':
Disable notification volume when user restricted
2015-07-14 14:18:00 +00:00
Jason Monk
19186edddb
am 7713fe26
: Merge "Disable notification volume when user restricted" into mnc-dev
...
* commit '7713fe26d2151a7ba8e9970d90f55ae184d48b7d':
Disable notification volume when user restricted
2015-07-14 14:02:27 +00:00
Jason Monk
7713fe26d2
Merge "Disable notification volume when user restricted" into mnc-dev
2015-07-14 13:53:29 +00:00
Martijn Coenen
bafffd149a
am 35738049
: am 8d9bb1ae
: Merge "Fix up Tap and Pay how it works." into mnc-dev
...
* commit '35738049df5aa6b14ef0721375cf40c5e7c60539':
Fix up Tap and Pay how it works.
2015-07-14 10:13:58 +00:00
Martijn Coenen
35738049df
am 8d9bb1ae
: Merge "Fix up Tap and Pay how it works." into mnc-dev
...
* commit '8d9bb1ae1d551699ba85061001ced90a157ae9ad':
Fix up Tap and Pay how it works.
2015-07-14 07:57:35 +00:00
Martijn Coenen
8d9bb1ae1d
Merge "Fix up Tap and Pay how it works." into mnc-dev
2015-07-14 07:45:01 +00:00
Jorim Jaggi
0798ef0523
Disable voice input if assist is voice service
...
Bug: 22358252
Change-Id: Id4a9de8c5287c5e025d0ccc7f98edd8855db519c
2015-07-14 04:13:57 +00:00
Maurice Lam
48b11b8158
am 49e0b9fd
: am a2511269
: am 39f92c0f
: am c6178ba0
: Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dr-dev
...
* commit '49e0b9fdff9741f51e69683b2f79b6079d344a67':
[Fingerprint] Export FingerprintEnrollIntroduction
2015-07-14 00:25:35 +00:00
Maurice Lam
49e0b9fdff
am a2511269
: am 39f92c0f
: am c6178ba0
: Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dr-dev
...
* commit 'a2511269745c7d8ae101996d02905fbed3c5bfe7':
[Fingerprint] Export FingerprintEnrollIntroduction
2015-07-13 23:50:34 +00:00
Sanket Padawe
389fbb748c
am 2db9291e
: am 7995ca41
: Use same technology type for LTE/4G
...
* commit '2db9291ea4ba1d880ebcc976c65b12dd24d080ad':
Use same technology type for LTE/4G
2015-07-13 23:34:48 +00:00
Chris Wren
209a72cab1
am b6d8b5f6
: am 2f8bb8ea
: Merge "import new view enums into MetricsLogger" into mnc-dev
...
* commit 'b6d8b5f6a4dfd5838f9e35d9ddd840e80f5bfec6':
import new view enums into MetricsLogger
2015-07-13 23:34:47 +00:00
Zoltan Szatmary-Ban
e4e520641d
am c968c407
: am 098c296d
: Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev
...
* commit 'c968c407f809f06dda02dffe25ea2a4ee9f4cb15':
Do not throw exception when MeasurementDetails.mediaSize is empty
2015-07-13 23:34:45 +00:00
Sanket Padawe
2db9291ea4
am 7995ca41
: Use same technology type for LTE/4G
...
* commit '7995ca4165cae43b9bff25a6e6eafdb51445b698':
Use same technology type for LTE/4G
2015-07-13 23:01:45 +00:00
Chris Wren
b6d8b5f6a4
am 2f8bb8ea
: Merge "import new view enums into MetricsLogger" into mnc-dev
...
* commit '2f8bb8ea97e87cacbe307c1d78fa7a6e096530eb':
import new view enums into MetricsLogger
2015-07-13 23:01:29 +00:00
Zoltan Szatmary-Ban
c968c407f8
am 098c296d
: Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev
...
* commit '098c296df2388bbcc906e8e149743eea7467b0a8':
Do not throw exception when MeasurementDetails.mediaSize is empty
2015-07-13 23:01:11 +00:00
Maurice Lam
39f92c0f54
am c6178ba0
: Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dr-dev
...
* commit 'c6178ba01236b60e90cc993103c633ea7eca299d':
[Fingerprint] Export FingerprintEnrollIntroduction
2015-07-13 22:34:42 +00:00
Billy Lau
7f70ba18e6
Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an
...
explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
Added new and refactored an old xml to define the UX for two new Preferences
in Advanced Settings. Modified the existing AdvancedAppSettings to add
control flow for two new settings. Also enriched ManageApplications to
handle these cases. Added additional strings in xml/values/strings.xml
to support these settings. Also defined new classes to handle these the
toggle of these permissions per app.
Refactored codes from AppStateUsageBridge to a generic AppStateAppOpsBridge so
that future usages related to AppOps can inherit from this class.
Change-Id: I43b81282a063e05844c7805556a6d05cfc02bcdb
2015-07-13 22:39:49 +01:00
Jason Monk
26cc9fcf66
Disable notification volume when user restricted
...
Bug: 22327825
Change-Id: I892627e00d9ebe2cd67348ce6da3c9c7bc0251fc
2015-07-13 15:15:36 -04:00
Wei Liu
de557d48ba
Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib.
...
Change-Id: Id6189e600eb2adb67f31d079a5a5ecfc99addccc
2015-07-13 12:01:42 -07:00
Sanket Padawe
7995ca4165
Use same technology type for LTE/4G
...
Though status bar and preferred network type show 4G, still show
LTE in SIM status when device set config_show4GForLTE true
Bug: 22213113
Change-Id: I2866a868992af7b4eb661d693a0cce60bb1b3402
2015-07-13 10:15:41 -07:00
Chris Wren
2f8bb8ea97
Merge "import new view enums into MetricsLogger" into mnc-dev
2015-07-13 16:21:26 +00:00
Zoltan Szatmary-Ban
098c296df2
Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev
2015-07-13 13:09:54 +00:00
Zoltan Szatmary-Ban
706e7014d8
Do not throw exception when MeasurementDetails.mediaSize is empty
...
It is legitimate for StorageMeasurement.measureExactStorage to return without any user keys
added to the returned MeasurementDetails, when the following is true:
mVolume == null || !mVolume.isMountedReadable()
Bug: 22394495
Change-Id: Ie40bd468a487208d98dc56aae41fdad7098f41a5
2015-07-13 12:37:31 +01:00
Maurice Lam
052297172e
[Fingerprint] Export FingerprintEnrollIntroduction
...
Export FingerprintEnrollIntroduction activity under the permission
USE_FINGERPRINT so that setup wizard can start it.
Bug: 21695577
Change-Id: If466c6e484a4aa0c10382cfedab0aad10ae26702
2015-07-10 21:00:02 -07:00
Chris Wren
ef94267afd
import new view enums into MetricsLogger
...
Bug: 21114836
Change-Id: I9a6e00ab8d85726ca6505a28ca7a52aef5aa1e1a
2015-07-10 17:19:58 -04:00
Robin Lee
4e3635d8db
am 722d5e22
: am be638020
: am 719cbc4a
: am d3b6832e
: am 7ba46433
: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
...
* commit '722d5e221aef34220f0e6be874f62b14b7dea13f':
Match getLegacyVpn calls to changed interface
2015-07-10 20:09:32 +00:00
Robin Lee
722d5e221a
am be638020
: am 719cbc4a
: am d3b6832e
: am 7ba46433
: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
...
* commit 'be638020e55c29b0b283713fb42c9866960b5755':
Match getLegacyVpn calls to changed interface
2015-07-10 19:55:12 +00:00