OSDN Git Service
Alex Klyubin [Thu, 7 Jan 2016 19:08:26 +0000 (19:08 +0000)]
Merge "[2/3] Remove unnecessary throws statement in ServiceManager"
Umair Khan [Thu, 7 Jan 2016 09:39:45 +0000 (15:09 +0530)]
[2/3] Remove unnecessary throws statement in ServiceManager
Change-Id: Ifcda96d3ccb411ba23b40ee5cf222c25843d8a0e
Signed-off-by: Umair Khan <omerjerk@gmail.com>
Mark Salyzyn [Wed, 6 Jan 2016 19:15:15 +0000 (19:15 +0000)]
Merge "Settings: switch to using ctl.start property instead of exec logcat"
Mark Salyzyn [Tue, 5 Jan 2016 23:51:46 +0000 (15:51 -0800)]
Settings: switch to using ctl.start property instead of exec logcat
- Moves policy of what to do with buffer size changes to logd
Bug:
23685592
Change-Id: Ib80a755213742dbf806a6f4423d5a709de2da645
Jeff Sharkey [Tue, 5 Jan 2016 16:11:14 +0000 (16:11 +0000)]
Merge "Some text are missing in eject sdcard warning"
Amith Yamasani [Tue, 5 Jan 2016 00:26:43 +0000 (00:26 +0000)]
Merge "Fix "division by zero" crash after USB mass storage disconnects"
Jason Monk [Mon, 4 Jan 2016 14:39:38 +0000 (14:39 +0000)]
Merge "fix out of memory with continuous entry and exit InstalledAppDetail."
daqiangx [Mon, 21 Dec 2015 08:02:25 +0000 (16:02 +0800)]
fix out of memory with continuous entry and exit InstalledAppDetail.
A session keeps in ApplicationsState list. The fragment don't release
the session when it is destroyed. The cause of out of memory is that the
session list is increased, but it can't be released.
Change-Id: I23635610c9fdfb8a3423299a91cf9b11cb5cdb65
Signed-off-by: daqiangx <daqiangx.li@intel.com>
Mark Salyzyn [Mon, 28 Dec 2015 17:35:26 +0000 (17:35 +0000)]
Merge "Settings: Add option to disable logging"
Xinghan Yue [Mon, 28 Dec 2015 16:59:44 +0000 (17:59 +0100)]
Fix "division by zero" crash after USB mass storage disconnects
File.java will return the total size in bytes of the partition
containing the path, and if the path does not exist,
it will return 0.
Change-Id: I134d4ec787b475e38bb37b4386bafcc419971c1e
Nick Kralevich [Wed, 23 Dec 2015 18:55:09 +0000 (18:55 +0000)]
Merge "Hide usb mode chooser dialog after disconnected"
Mark Salyzyn [Tue, 22 Dec 2015 22:09:48 +0000 (14:09 -0800)]
Settings: Add option to disable logging
Bug:
26178938
Change-Id: I64263595705ceb1e6816e3cdfa982929877ff5b2
Du, Changbin [Thu, 17 Dec 2015 02:26:26 +0000 (10:26 +0800)]
Hide usb mode chooser dialog after disconnected
Add a UsbDisconnectedReceiver to listen usb state event, and hide
the usb mode chooser dialog if usb disconnected.
Change-Id: I871f56cb5a310e20950926180d9747dd9fad9754
Signed-off-by: Du, Changbin <changbin.du@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
Henrik Baard [Mon, 14 Dec 2015 09:16:28 +0000 (10:16 +0100)]
Some text are missing in eject sdcard warning
The eject sdcard warning page shows incomplete texts
in some languages (german) and it is not apparant that
that you can scroll to see the text.
The layout is divided into three parts, the button
and one blank line, and the text. The text and the
blanke space will have equal parts of the screen
since they have the same weight. Because of this the
(complete) text is not shown in som languages.
Remove the blank part and let the text use the whole
screen.
Change-Id: Id8fd88fc6c0aa6105d64c100e3365cd9b00bf851
Svetoslav Ganov [Thu, 3 Dec 2015 22:45:05 +0000 (22:45 +0000)]
Merge "[DO NOT MERGE] Modify system settings: incorrect UI state"
am:
c4321c7e6c -s ours
* commit '
c4321c7e6caa1a3699567f9c39d2bc33bbf39c6b':
[DO NOT MERGE] Modify system settings: incorrect UI state
Svetoslav Ganov [Thu, 3 Dec 2015 22:38:54 +0000 (22:38 +0000)]
Merge "[DO NOT MERGE] Modify system settings: incorrect UI state"
Svetoslav [Thu, 3 Dec 2015 22:36:30 +0000 (14:36 -0800)]
[DO NOT MERGE] Modify system settings: incorrect UI state
The privilege for an app to write to the system settings is protected
by an app-op signature permission. App-op permissions are special: if
the app-op is deny/allow we deny/allow write access; if the app-op is
default holding the permission determies write access. The settings
code assumes that CHANGE_NETWORK_STATE is an app op permission
(system|appop) while it is a normal permission which any app gets by
declaring it used in the manifest.
The side effect is that the state of the toggle in the UI for write
system settings will initially be in the wrong state if the app uses
both WRITE_SETTINGS and CHANGE_NETWORK_STATE. However, the code in
the public API an app uses to check write settings access would return
the opposite since it checks the WRITE_SETTINGS permission and its
app op. Hence, if an app requires write settings to start the user
will see in the settings UI it has access but the app will not have
access, so the app would prompt the user to allow write settings.
The non-obvious fix is for the user to toggle the setting off and on
to get the app op in the right state and be able to launch the app.
bug:
25843134
Change-Id: I2da4eec1c3574bd6aef9ab968c9deb148536cb0a
Robin Lee [Fri, 13 Nov 2015 14:08:52 +0000 (14:08 +0000)]
Merge "VPN settings: grey out policy-restricted menus"
am:
ee4808d37b
* commit '
ee4808d37b955299501e9b753cc7bb19877d4f83':
VPN settings: grey out policy-restricted menus
Robin Lee [Fri, 13 Nov 2015 14:07:05 +0000 (14:07 +0000)]
Merge "VPN settings: grey out policy-restricted menus"
Robin Lee [Fri, 16 Oct 2015 11:37:59 +0000 (12:37 +0100)]
VPN settings: grey out policy-restricted menus
setHasOptionsMenu seems unreliable at stopping onCreateOptoinsMenu from
being called.
Change-Id: Ie86da8e35dddb6e3a0e4678defc55bf5776f6c2f
Baligh Uddin [Wed, 4 Nov 2015 20:11:39 +0000 (12:11 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I38ff46207ad622dc25f4cbbf6445ceac1dcfedb7
Jason Monk [Wed, 4 Nov 2015 14:56:04 +0000 (14:56 +0000)]
Merge "Don\'t show MIDI USB option if not supported"
am:
c2a9cd03f7
* commit '
c2a9cd03f71b3b6b0af2f6faaf877fd9c75dd9fe':
Don't show MIDI USB option if not supported
Jason Monk [Wed, 4 Nov 2015 14:43:11 +0000 (14:43 +0000)]
Merge "Don't show MIDI USB option if not supported"
Zoran Jovanovic [Wed, 4 Nov 2015 13:00:03 +0000 (14:00 +0100)]
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
Geoff Mendal [Wed, 28 Oct 2015 14:10:08 +0000 (14:10 +0000)]
Import translations. DO NOT MERGE am:
260d90a102 -s ours am:
04817defc9 -s ours
am:
fe5582a26b -s ours
* commit '
fe5582a26b461482c51a163b76c2283ae96116eb':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Oct 2015 14:05:28 +0000 (14:05 +0000)]
Import translations. DO NOT MERGE am:
260d90a102 -s ours
am:
04817defc9 -s ours
* commit '
04817defc935af871ec90b971f61d4b31d28c97d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Oct 2015 14:00:31 +0000 (14:00 +0000)]
Import translations. DO NOT MERGE
am:
260d90a102 -s ours
* commit '
260d90a102b3a0d7ba51c5bf73d34291ef2f4910':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Oct 2015 13:55:41 +0000 (08:55 -0500)]
Import translations. DO NOT MERGE
Change-Id: I2c1d24dee82b74a8db0f2fa30077b71e085ca0cd
Auto-generated-cl: translation import
Geoff Mendal [Mon, 26 Oct 2015 14:22:41 +0000 (14:22 +0000)]
Import translations. DO NOT MERGE am:
c338bacb59 -s ours am:
884a8bbe78 -s ours
am:
436fcc47fc -s ours
* commit '
436fcc47fce217f4c2b6301fe94fa87ffd6c0dbe':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 14:17:02 +0000 (14:17 +0000)]
Import translations. DO NOT MERGE am:
c338bacb59 -s ours
am:
884a8bbe78 -s ours
* commit '
884a8bbe7872e8d7aa94f854e4057d2d073cd09a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 14:13:23 +0000 (14:13 +0000)]
Import translations. DO NOT MERGE
am:
c338bacb59 -s ours
* commit '
c338bacb59b13bed45239a587e3429b4bed00a71':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 14:03:05 +0000 (07:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I63ec2877912de3a9884975bfa5fee6849d0d191f
Auto-generated-cl: translation import
Jason Monk [Thu, 22 Oct 2015 23:42:14 +0000 (23:42 +0000)]
Fix crash in Settings from uninstall am:
6e2e8e17cf am:
34d6ea560d
am:
eccc9b3962
* commit '
eccc9b39626c525763e5590728f413e4d7ff8cf5':
Fix crash in Settings from uninstall
Jason Monk [Thu, 22 Oct 2015 23:37:48 +0000 (23:37 +0000)]
Fix crash in Settings from uninstall am:
6e2e8e17cf
am:
34d6ea560d
* commit '
34d6ea560d3935eef6e53e93d5bb7ba1a8148965':
Fix crash in Settings from uninstall
Jason Monk [Thu, 22 Oct 2015 23:12:02 +0000 (23:12 +0000)]
Fix crash in Settings from uninstall
am:
6e2e8e17cf
* commit '
6e2e8e17cfea09548067baa8b361dbc31dce385c':
Fix crash in Settings from uninstall
Jason Monk [Thu, 22 Oct 2015 22:32:08 +0000 (15:32 -0700)]
Fix crash in Settings from uninstall
Bug:
25171390
Change-Id: Idd0319a5c003ba2183264684806d2b0aaffa1d7e
Geoff Mendal [Wed, 21 Oct 2015 16:47:13 +0000 (16:47 +0000)]
Import translations. DO NOT MERGE am:
a489856def -s ours am:
f3ad526200 -s ours
am:
79e81bca9c -s ours
* commit '
79e81bca9c11b35bbc4522fbe8117dc0b425ccc7':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 14:59:01 +0000 (14:59 +0000)]
Import translations. DO NOT MERGE am:
a489856def -s ours
am:
f3ad526200 -s ours
* commit '
f3ad5262003947120243736851ff5dce7ae7635a':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 14:48:15 +0000 (14:48 +0000)]
Import translations. DO NOT MERGE
am:
a489856def -s ours
* commit '
a489856def386e52f3507370f5b504841bab7a61':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 14:05:23 +0000 (07:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaa4f7f7ae9707b8eccf00b17816d3f995234c8f9
Auto-generated-cl: translation import
Jason Monk [Wed, 21 Oct 2015 02:20:21 +0000 (02:20 +0000)]
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
Jason Monk [Wed, 21 Oct 2015 01:46:11 +0000 (01:46 +0000)]
Allow access to permissions, even if app has none am:
36866c8e84
am:
6fde534148
* commit '
6fde534148c3f93b6362d4927270f81048a6bef3':
Allow access to permissions, even if app has none
Jason Monk [Wed, 21 Oct 2015 01:43:06 +0000 (01:43 +0000)]
Allow access to permissions, even if app has none
am:
36866c8e84
* commit '
36866c8e84acd26e82b072f2d39106d0e58e6a84':
Allow access to permissions, even if app has none
Jason Monk [Tue, 20 Oct 2015 23:38:58 +0000 (19:38 -0400)]
Allow access to permissions, even if app has none
Bug:
24026650
Change-Id: I171ab69ded27c1bf2c791f9673a14d56014471bb
Jeff Sharkey [Tue, 20 Oct 2015 18:34:46 +0000 (18:34 +0000)]
Merge branch 'mnc-dr-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Settings into mnc-dr-dev-plus-aosp
Jeff Sharkey [Tue, 20 Oct 2015 18:34:40 +0000 (18:34 +0000)]
Merge "Hide empty data usage cycles." into mnc-dr-dev am:
2fcbdb7bb6 am:
82839c8073
am:
0b07ce50a7
* commit '
0b07ce50a7e3069be81214559652ad2bf2191378':
Hide empty data usage cycles.
Michael Wright [Tue, 20 Oct 2015 18:34:24 +0000 (18:34 +0000)]
Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Settings into mnc-ub-dev
am:
98ec49dd6c
* commit '
98ec49dd6c3105e342cf8e6c4fb5eb6168924b13':
Michael Wright [Tue, 20 Oct 2015 18:34:11 +0000 (18:34 +0000)]
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.
Jeff Sharkey [Tue, 20 Oct 2015 18:32:34 +0000 (18:32 +0000)]
Merge "Hide empty data usage cycles." into mnc-dr-dev am:
2fcbdb7bb6 am:
82839c8073
am:
0b07ce50a7
* commit '
0b07ce50a7e3069be81214559652ad2bf2191378':
Hide empty data usage cycles.
Jeff Sharkey [Tue, 20 Oct 2015 18:30:09 +0000 (18:30 +0000)]
Merge "Clamp large data usage values." into mnc-dr-dev am:
29b0ea2dbf am:
a8bd650e81
am:
10338550c4
* commit '
10338550c42421595896377f68545df1f8a93644':
Clamp large data usage values.
Michael Wright [Tue, 20 Oct 2015 17:54:53 +0000 (17:54 +0000)]
Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Settings into mnc-ub-dev
Michael Wright [Tue, 20 Oct 2015 17:54:46 +0000 (17:54 +0000)]
Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev am:
66b6591d4c
am:
6e957d6b42
* commit '
6e957d6b42f8cc13e93d0ee7cfb97dea4f0c2b76':
Always show pairing dialog for device-specific keyboard.
Michael Wright [Tue, 20 Oct 2015 17:54:29 +0000 (17:54 +0000)]
Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev am:
66b6591d4c
am:
6e957d6b42
* commit '
6e957d6b42f8cc13e93d0ee7cfb97dea4f0c2b76':
Always show pairing dialog for device-specific keyboard.
Jeff Sharkey [Tue, 20 Oct 2015 17:49:25 +0000 (17:49 +0000)]
Merge "Hide empty data usage cycles." into mnc-dr-dev am:
2fcbdb7bb6
am:
82839c8073
* commit '
82839c8073ff358e036c7ae54e52041e4a51738e':
Hide empty data usage cycles.
Jeff Sharkey [Tue, 20 Oct 2015 17:48:14 +0000 (17:48 +0000)]
Merge "Clamp large data usage values." into mnc-dr-dev am:
29b0ea2dbf
am:
a8bd650e81
* commit '
a8bd650e810178358251e3099f949af8422d5a24':
Clamp large data usage values.
Michael Wright [Tue, 20 Oct 2015 17:35:19 +0000 (17:35 +0000)]
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.
Jeff Sharkey [Tue, 20 Oct 2015 17:33:50 +0000 (17:33 +0000)]
Merge "Hide empty data usage cycles." into mnc-dr-dev
am:
2fcbdb7bb6
* commit '
2fcbdb7bb677ed06ca5e3fbe558aff77259c194c':
Hide empty data usage cycles.
Jeff Sharkey [Tue, 20 Oct 2015 17:32:47 +0000 (17:32 +0000)]
Merge "Clamp large data usage values." into mnc-dr-dev
am:
29b0ea2dbf
* commit '
29b0ea2dbf8f0a31d02af8a4ce17753c9499b167':
Clamp large data usage values.
Michael Wright [Tue, 20 Oct 2015 17:23:40 +0000 (17:23 +0000)]
Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev
Jeff Sharkey [Tue, 20 Oct 2015 17:21:52 +0000 (17:21 +0000)]
Merge "Hide empty data usage cycles." into mnc-dr-dev
Jeff Sharkey [Tue, 20 Oct 2015 17:21:43 +0000 (17:21 +0000)]
Merge "Clamp large data usage values." into mnc-dr-dev
Geoff Mendal [Tue, 20 Oct 2015 11:59:56 +0000 (11:59 +0000)]
Import translations. DO NOT MERGE am:
3a7368e9c3 -s ours am:
6bdaffa2af -s ours
am:
275a235437 -s ours
* commit '
275a235437c3dfe4824cd1ca36aff38c81fa46fb':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 20 Oct 2015 11:56:07 +0000 (11:56 +0000)]
Import translations. DO NOT MERGE am:
3a7368e9c3 -s ours
am:
6bdaffa2af -s ours
* commit '
6bdaffa2af987725f54cae246b5ed694720213bb':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 20 Oct 2015 11:52:42 +0000 (11:52 +0000)]
Import translations. DO NOT MERGE
am:
3a7368e9c3 -s ours
* commit '
3a7368e9c32af8c3245c8effc98de9e75f90f27a':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 20 Oct 2015 04:22:01 +0000 (21:22 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25001286
Change-Id: Idc0260cd6aead133bb00dc3b62ddd21009a6315c
Jason Monk [Tue, 20 Oct 2015 03:00:11 +0000 (03:00 +0000)]
Hide SIM and IMEI for wifi only devices am:
417a0500c3 am:
2a90c111ee
am:
554c3aef41
* commit '
554c3aef41c089d2baf6f2f6894de14e576f6d45':
Hide SIM and IMEI for wifi only devices
Jason Monk [Tue, 20 Oct 2015 02:22:55 +0000 (02:22 +0000)]
Hide SIM and IMEI for wifi only devices am:
417a0500c3
am:
2a90c111ee
* commit '
2a90c111ee994a0b8d95039b102ab280d6ce9d6b':
Hide SIM and IMEI for wifi only devices
Jason Monk [Tue, 20 Oct 2015 02:05:14 +0000 (02:05 +0000)]
Hide SIM and IMEI for wifi only devices
am:
417a0500c3
* commit '
417a0500c3d7e14013751dbe62791487b033ee72':
Hide SIM and IMEI for wifi only devices
Jeff Sharkey [Tue, 20 Oct 2015 00:22:05 +0000 (17:22 -0700)]
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
Jason Monk [Mon, 19 Oct 2015 23:48:15 +0000 (19:48 -0400)]
Hide SIM and IMEI for wifi only devices
Bug:
24342670
Change-Id: Icfb7db0c1b5c6688c16248daa5e6c0443ff45392
Jeff Sharkey [Mon, 19 Oct 2015 23:41:53 +0000 (16:41 -0700)]
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
Geoff Mendal [Mon, 19 Oct 2015 14:38:55 +0000 (14:38 +0000)]
am
b2568ed0: (-s ours) am
35e01bf7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am:
84c62dde3d -s ours
* commit '
b2568ed0d1ae4cdaabcb061b2a503fece4aaa22a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 14:33:34 +0000 (14:33 +0000)]
am
35e01bf7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am:
84c62dde3d -s ours
* commit '
35e01bf70f560c3651ae34968cd1082cb2dd8536':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 14:28:59 +0000 (14:28 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
am:
84c62dde3d -s ours
* commit '
84c62dde3d737e0cc194a24e76dbdac9e8c75170':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 14:27:20 +0000 (14:27 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 19 Oct 2015 14:25:38 +0000 (07:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9068be1f0479a7025a7eacfce03046cd54e3d1a8
Auto-generated-cl: translation import
Geoff Mendal [Mon, 19 Oct 2015 13:17:46 +0000 (13:17 +0000)]
am
ca059bfb: (-s ours) am
51b43e12: (-s ours) am
99131cf6: (-s ours) am
f191953c: (-s ours) Import translations. DO NOT MERGE am:
862568de0d -s ours
* commit '
ca059bfb439df9db2c4ee2f7d860e8a29bf0a91f':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 13:13:08 +0000 (13:13 +0000)]
am
51b43e12: (-s ours) am
99131cf6: (-s ours) am
f191953c: (-s ours) Import translations. DO NOT MERGE am:
862568de0d -s ours
* commit '
51b43e1236fa70711d914d0bc117a1ac745f0172':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 13:09:13 +0000 (13:09 +0000)]
am
99131cf6: (-s ours) am
f191953c: (-s ours) Import translations. DO NOT MERGE
am:
862568de0d -s ours
* commit '
862568de0d722af6f47e02b8c6fbf8efb9d6b6cc':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 13:04:28 +0000 (13:04 +0000)]
am
99131cf6: (-s ours) am
f191953c: (-s ours) Import translations. DO NOT MERGE
* commit '
99131cf64253cf997d8ee6e356843e376a141846':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 13:01:28 +0000 (13:01 +0000)]
am
f191953c: (-s ours) Import translations. DO NOT MERGE
* commit '
f191953c77af3c5b78e576a430577aaf050aa5f1':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 12:21:10 +0000 (05:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id2b08418cad5acba5716761650814489a2a94234
Auto-generated-cl: translation import
Jason Monk [Fri, 16 Oct 2015 16:49:38 +0000 (16:49 +0000)]
am
d2975f9d: am
d9774c9f: am
cdcba9ce: Merge "Fix crashes in Settings" into mnc-dr-dev
* commit '
d2975f9d0c12b46978c2a108961617293eeaba85':
Fix crashes in Settings
Jason Monk [Fri, 16 Oct 2015 16:45:11 +0000 (16:45 +0000)]
am
d9774c9f: am
cdcba9ce: Merge "Fix crashes in Settings" into mnc-dr-dev
* commit '
d9774c9f5b4b5e0c51c03795cdc1658d1388ec87':
Fix crashes in Settings
Jason Monk [Fri, 16 Oct 2015 16:41:22 +0000 (16:41 +0000)]
am
cdcba9ce: Merge "Fix crashes in Settings" into mnc-dr-dev
* commit '
cdcba9ce5f44cf4cad9e308919272db4e15e9717':
Fix crashes in Settings
Jason Monk [Fri, 16 Oct 2015 16:33:56 +0000 (16:33 +0000)]
Merge "Fix crashes in Settings" into mnc-dr-dev
Jeff Sharkey [Fri, 16 Oct 2015 16:29:54 +0000 (16:29 +0000)]
am
31e2ce0e: am
d36edb9f: am
de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev
* commit '
31e2ce0ea617bfe07a5c20d3c2b0433f14531678':
Bail if activity was destroyed.
Jeff Sharkey [Fri, 16 Oct 2015 16:24:30 +0000 (16:24 +0000)]
am
d36edb9f: am
de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev
* commit '
d36edb9f462ee430d53515e02534e20d92e7a5d0':
Bail if activity was destroyed.
Jeff Sharkey [Fri, 16 Oct 2015 16:18:41 +0000 (16:18 +0000)]
am
de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev
* commit '
de005547bae3799265fdad8f61720a82241f4b07':
Bail if activity was destroyed.
Jeff Sharkey [Fri, 16 Oct 2015 16:14:47 +0000 (16:14 +0000)]
Merge "Bail if activity was destroyed." into mnc-dr-dev
Jason Monk [Fri, 16 Oct 2015 14:13:53 +0000 (10:13 -0400)]
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
Amit Mahajan [Wed, 14 Oct 2015 23:49:08 +0000 (23:49 +0000)]
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.
Amit Mahajan [Wed, 14 Oct 2015 23:42:33 +0000 (23:42 +0000)]
am
6d042a69: am
1704ca96: Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev
* commit '
6d042a69aa23db5a50c429e7fcda9dc3327f880d':
Change to add user_visible field to Carriers table.
Amit Mahajan [Wed, 14 Oct 2015 23:37:32 +0000 (23:37 +0000)]
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.
Amit Mahajan [Wed, 14 Oct 2015 23:33:01 +0000 (23:33 +0000)]
Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev
Jeff Sharkey [Wed, 14 Oct 2015 21:45:52 +0000 (14:45 -0700)]
Bail if activity was destroyed.
Bug:
24172045
Change-Id: I723951b3478459fc70e29d25386f8d7197964e3d
Erik Kline [Wed, 14 Oct 2015 17:55:18 +0000 (17:55 +0000)]
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.
Erik Kline [Wed, 14 Oct 2015 17:48:50 +0000 (17:48 +0000)]
am
51d71aa2: am
583deb52: Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev
* commit '
51d71aa2bf1f84fffda6b4144520e9a3bad25985':
Unconfigure the lockdown VPN if the user forgets its profile.
Erik Kline [Wed, 14 Oct 2015 17:42:15 +0000 (17:42 +0000)]
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.
Erik Kline [Wed, 14 Oct 2015 17:37:52 +0000 (17:37 +0000)]
Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev
OSDN Git Service
