Commit Graph

9484 Commits

Author SHA1 Message Date
Sanket Padawe
f20ba4b797 Uncheck checkbox for contact sharing by default for non carkit devices. am: dbc47fb262 am: 0ad16831ee
am: df5b8c5b65

* commit 'df5b8c5b65050f08c36c1610d856282ab05fae5f':
  Uncheck checkbox for contact sharing by default for non carkit devices.
2015-11-13 00:07:06 +00:00
Sanket Padawe
0ad16831ee Uncheck checkbox for contact sharing by default for non carkit devices.
am: dbc47fb262

* commit 'dbc47fb262a4273417d99dabab757854aa3b0eaf':
  Uncheck checkbox for contact sharing by default for non carkit devices.
2015-11-12 23:57:48 +00:00
Sanket Padawe
dbc47fb262 Uncheck checkbox for contact sharing by default for non carkit devices.
+ In BT pairing dialog, uncheck checkbox for contact sharing by default
for devices not recognized as carkits at pair time.

Bug: 23607427
Change-Id: I7f1d40d86e713e248d3c225459be4895c4f75d76
2015-11-12 14:55:51 -08:00
Jason Monk
7ee05202ab Null check queryIntentServices am: a4c9492b50 am: e27cada8c4
am: e198f7b84f

* commit 'e198f7b84fde2b3ca3f0e0c9195166b06363850e':
  Null check queryIntentServices
2015-11-09 22:40:33 +00:00
Jason Monk
e27cada8c4 Null check queryIntentServices
am: a4c9492b50

* commit 'a4c9492b50b742488a6a92abdc290b5ada3c004b':
  Null check queryIntentServices
2015-11-09 22:31:51 +00:00
Jason Monk
a4c9492b50 Null check queryIntentServices
Bug: 25575738
Change-Id: I006a0e2f47863ac0f5d8ae28c88614481d13e8d3
2015-11-09 16:56:46 -05:00
Jason Monk
1150cfce95 Merge "Don\'t show MIDI USB option if not supported" am: c2a9cd03f7
am: 92aafd3ed5

* commit '92aafd3ed5391eb5b172c54e6ea820dd36110c99':
  Don't show MIDI USB option if not supported
2015-11-04 15:02:47 +00:00
Jason Monk
92aafd3ed5 Merge "Don\'t show MIDI USB option if not supported"
am: c2a9cd03f7

* commit 'c2a9cd03f71b3b6b0af2f6faaf877fd9c75dd9fe':
  Don't show MIDI USB option if not supported
2015-11-04 14:56:04 +00:00
Zoran Jovanovic
81ec094554 Don't show MIDI USB option if not supported
If device doesn't support MIDI, don't show MIDI in "Use USB for" menu
when USB cable is connected.
(Selecting MIDI will crash the Settings app.)

Change-Id: I60f4cbb6357f162fecb574cdb6766cf5ed92e78e
2015-11-04 15:21:58 +01:00
Dianne Hackborn
c271a8a00e Merge "Further tweak to issue #issue #25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am: 3b4e4dd91d am: a42bad972c
am: 44643bad26

* commit '44643bad268fa65d8a5d95055a8a9c2c4bf86fdf':
  Further tweak to issue #issue #25371736: Don't include z-ram allocations in Android OS
2015-10-30 17:27:44 +00:00
Dianne Hackborn
a42bad972c Merge "Further tweak to issue #issue #25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev
am: 3b4e4dd91d

* commit '3b4e4dd91d416c93fdc0326e54469ceabb8281ab':
  Further tweak to issue #issue #25371736: Don't include z-ram allocations in Android OS
2015-10-30 17:20:13 +00:00
Dianne Hackborn
b6c7b05056 Further tweak to issue #issue #25371736: Don't include z-ram allocations in Android OS
Make sure the duration shown for z-ram is sane (the maximum of the
other process durations of that app).

Change-Id: I62c46b89f927b2c7c16f5c31f6910419b2bdd130
2015-10-29 17:32:28 -07:00
Dianne Hackborn
6ee79b2823 Merge "Fix issue #25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am: 508559d076 am: 68954d930d
am: 2af9128966

* commit '2af9128966ee855d6c8e06479562cb141c625511':
  Fix issue #25371736: Don't include z-ram allocations in Android OS
2015-10-29 23:46:20 +00:00
Dianne Hackborn
68954d930d Merge "Fix issue #25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev
am: 508559d076

* commit '508559d0760596509f07fa56371c6e18d8bd9559':
  Fix issue #25371736: Don't include z-ram allocations in Android OS
2015-10-29 23:39:39 +00:00
Dianne Hackborn
30bbd902dd Fix issue #25371736: Don't include z-ram allocations in Android OS
Just distribute them across all of the running apps, by creating
an additional fake "z-ram" process for each of them.

Change-Id: I9b4efe9c7b907779a0ec76cb8652709619e2e686
2015-10-29 15:43:21 -07:00
Jason Monk
652ba5e22e Fix crash in Settings from uninstall am: 6e2e8e17cf am: 34d6ea560d
am: eccc9b3962

* commit 'eccc9b39626c525763e5590728f413e4d7ff8cf5':
  Fix crash in Settings from uninstall
2015-10-22 23:42:14 +00:00
Jason Monk
34d6ea560d Fix crash in Settings from uninstall
am: 6e2e8e17cf

* commit '6e2e8e17cfea09548067baa8b361dbc31dce385c':
  Fix crash in Settings from uninstall
2015-10-22 23:12:02 +00:00
Jason Monk
6e2e8e17cf Fix crash in Settings from uninstall
Bug: 25171390
Change-Id: Idd0319a5c003ba2183264684806d2b0aaffa1d7e
2015-10-22 22:58:50 +00:00
Jason Monk
4f9f28effb Allow access to permissions, even if app has none am: 36866c8e84 am: 6fde534148
am: 47db2ba628

* commit '47db2ba62840135894cf139886c68e63a4497626':
  Allow access to permissions, even if app has none
2015-10-21 02:20:21 +00:00
Jason Monk
6fde534148 Allow access to permissions, even if app has none
am: 36866c8e84

* commit '36866c8e84acd26e82b072f2d39106d0e58e6a84':
  Allow access to permissions, even if app has none
2015-10-21 01:43:06 +00:00
Jason Monk
36866c8e84 Allow access to permissions, even if app has none
Bug: 24026650
Change-Id: I171ab69ded27c1bf2c791f9673a14d56014471bb
2015-10-20 19:38:58 -04:00
Michael Wright
e794a5814c Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev am: 66b6591d4c am: 6e957d6b42
am: 94a5587ed6

* commit '94a5587ed664fa2e3996534d9ccf41394a1f131e':
  Always show pairing dialog for device-specific keyboard.
2015-10-20 18:34:11 +00:00
Jeff Sharkey
2197d960a9 Merge "Hide empty data usage cycles." into mnc-dr-dev am: 2fcbdb7bb6 am: 82839c8073
am: 0b07ce50a7

* commit '0b07ce50a7e3069be81214559652ad2bf2191378':
  Hide empty data usage cycles.
2015-10-20 18:32:34 +00:00
Jeff Sharkey
071352de9e Merge "Clamp large data usage values." into mnc-dr-dev am: 29b0ea2dbf am: a8bd650e81
am: 10338550c4

* commit '10338550c42421595896377f68545df1f8a93644':
  Clamp large data usage values.
2015-10-20 18:30:09 +00:00
Michael Wright
6e957d6b42 Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev
am: 66b6591d4c

* commit '66b6591d4c14400a18573a11880db16bb26ab80a':
  Always show pairing dialog for device-specific keyboard.
2015-10-20 17:35:19 +00:00
Jeff Sharkey
82839c8073 Merge "Hide empty data usage cycles." into mnc-dr-dev
am: 2fcbdb7bb6

* commit '2fcbdb7bb677ed06ca5e3fbe558aff77259c194c':
  Hide empty data usage cycles.
2015-10-20 17:33:50 +00:00
Jeff Sharkey
a8bd650e81 Merge "Clamp large data usage values." into mnc-dr-dev
am: 29b0ea2dbf

* commit '29b0ea2dbf8f0a31d02af8a4ce17753c9499b167':
  Clamp large data usage values.
2015-10-20 17:32:47 +00:00
Michael Wright
66b6591d4c Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev 2015-10-20 17:23:40 +00:00
Jeff Sharkey
2fcbdb7bb6 Merge "Hide empty data usage cycles." into mnc-dr-dev 2015-10-20 17:21:52 +00:00
Jeff Sharkey
29b0ea2dbf Merge "Clamp large data usage values." into mnc-dr-dev 2015-10-20 17:21:43 +00:00
Jason Monk
8e18934478 Hide SIM and IMEI for wifi only devices am: 417a0500c3 am: 2a90c111ee
am: 554c3aef41

* commit '554c3aef41c089d2baf6f2f6894de14e576f6d45':
  Hide SIM and IMEI for wifi only devices
2015-10-20 03:00:11 +00:00
Jason Monk
2a90c111ee Hide SIM and IMEI for wifi only devices
am: 417a0500c3

* commit '417a0500c3d7e14013751dbe62791487b033ee72':
  Hide SIM and IMEI for wifi only devices
2015-10-20 02:05:14 +00:00
Jeff Sharkey
02551ecd2e Hide empty data usage cycles.
When building list of historical data usage cycles, omit cycles
that don't contain any data usage.  A bad NITZ or NTP fix may have
caused us to record some usage in 1970 or 2038, which would have
shown all the cycles in between.  Now we hide empty cycles to keep
things clean.

Bug: 18282691
Change-Id: Ib04c95d1411400ba9967d311b59402a26d39cfe3
2015-10-19 17:28:04 -07:00
Jason Monk
417a0500c3 Hide SIM and IMEI for wifi only devices
Bug: 24342670
Change-Id: Icfb7db0c1b5c6688c16248daa5e6c0443ff45392
2015-10-19 20:02:11 -04:00
Jeff Sharkey
3105ea30d4 Clamp large data usage values.
Without clamping, they can wrap around to negative values and cause
all sorts of havok.  1TB ought to be enough for anyone: that's 3Mbps
for a solid month.

Bug: 24555152
Change-Id: If92c87f9920c3f05cd3ff2cc6630b1bbb65335b8
2015-10-19 16:41:53 -07:00
Jason Monk
6d85d1686e am d2975f9d: am d9774c9f: am cdcba9ce: Merge "Fix crashes in Settings" into mnc-dr-dev
* commit 'd2975f9d0c12b46978c2a108961617293eeaba85':
  Fix crashes in Settings
2015-10-16 16:49:38 +00:00
Jason Monk
d9774c9f5b am cdcba9ce: Merge "Fix crashes in Settings" into mnc-dr-dev
* commit 'cdcba9ce5f44cf4cad9e308919272db4e15e9717':
  Fix crashes in Settings
2015-10-16 16:41:22 +00:00
Jason Monk
cdcba9ce5f Merge "Fix crashes in Settings" into mnc-dr-dev 2015-10-16 16:33:56 +00:00
Jeff Sharkey
bfee8b484f am 31e2ce0e: am d36edb9f: am de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev
* commit '31e2ce0ea617bfe07a5c20d3c2b0433f14531678':
  Bail if activity was destroyed.
2015-10-16 16:29:54 +00:00
Jeff Sharkey
d36edb9f46 am de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev
* commit 'de005547bae3799265fdad8f61720a82241f4b07':
  Bail if activity was destroyed.
2015-10-16 16:18:41 +00:00
Jeff Sharkey
de005547ba Merge "Bail if activity was destroyed." into mnc-dr-dev 2015-10-16 16:14:47 +00:00
Jason Monk
77b11fa470 Fix crashes in Settings
Fix problems from unsupported intents being launched through adb.
Remove the ones we can, fix the other.

Bug: 19634064
Change-Id: Iba0adeb135e76ee70365e5891380ba8b55110c26
2015-10-16 10:13:53 -04:00
Amit Mahajan
7b99029832 am f20d51f3: am 6d042a69: am 1704ca96: Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev
* commit 'f20d51f3b02fafb6001e91de8b3d5a15e6222099':
  Change to add user_visible field to Carriers table.
2015-10-14 23:49:08 +00:00
Amit Mahajan
6d042a69aa am 1704ca96: Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev
* commit '1704ca968d4566218f159817625f849c1dc34d96':
  Change to add user_visible field to Carriers table.
2015-10-14 23:37:32 +00:00
Amit Mahajan
1704ca968d Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev 2015-10-14 23:33:01 +00:00
Jeff Sharkey
cabb62faf3 Bail if activity was destroyed.
Bug: 24172045
Change-Id: I723951b3478459fc70e29d25386f8d7197964e3d
2015-10-14 14:45:52 -07:00
Erik Kline
38fc400ac9 am 453d52b6: am 51d71aa2: am 583deb52: Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev
* commit '453d52b6575ebd97c7b4c962bd3a687c1c163968':
  Unconfigure the lockdown VPN if the user forgets its profile.
2015-10-14 17:55:18 +00:00
Erik Kline
51d71aa2bf am 583deb52: Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev
* commit '583deb524b2d6ed2fd2741c605d5ae02c5c5d52a':
  Unconfigure the lockdown VPN if the user forgets its profile.
2015-10-14 17:42:15 +00:00
Lorenzo Colitti
c311c94af5 Unconfigure the lockdown VPN if the user forgets its profile.
Currently, if the user clicks "forget" on the configuration
dialog for the profile that is currently being used by the
always-on VPN, we don't disable the lockdown VPN, and we crash
on next boot because ConnectivityService tries to start
LockdownVpnTracker with an invalid configuration.

Fix this by removing the LOCKDOWN_VPN variable in the keystore
(which disables the always-on VPN), and notifying
ConnectivityService.

Bug: 23625458
Change-Id: I3545286c9fc23517306aa94607a4b2cb55cc56c4
2015-10-13 15:23:38 +09:00
Christopher Tate
192248cc9a am eba9ff7c: am 78f7fa0f: am 90de3beb: Disable app-link preferences for browser apps
* commit 'eba9ff7c64767ba903a424adf6c74844317908cb':
  Disable app-link preferences for browser apps
2015-10-10 00:14:12 +00:00