Commit Graph

23296 Commits

Author SHA1 Message Date
Mark Salyzyn
94ab88228e resolve merge conflicts of f3cc23524f to mnc-dr2-dev-plus-aosp.
Change-Id: I8fe1e5b4797405b2f470fb3fa538bd3728048f00
2015-12-28 10:49:04 -08:00
Mark Salyzyn
f3cc23524f Merge "Settings: Add option to disable logging" 2015-12-28 17:35:26 +00:00
Xinghan Yue
b997bd989e 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
2015-12-28 18:01:51 +01:00
Eri Kasamatsu
70b1928a5a Change receiver name attribute for DISCOVERABLE_TIMEOUT
BluetoothDiscoverableTimeoutReceiver cannot receive
DISCOVERABLE_TIMEOUT intent because receiver name attribute
was incorrect.

BluetoothDiscoverableTimeoutReceiver has been moved to
frameworks/base/packages/SettingsLib/.../bluetooth
from packages/apps/Settings/.../bluetooth/.

Change-Id: I52bb32b2e206f5ed85207d6908e3ab39cbcd12cc
2015-12-24 00:34:23 +01:00
Nick Kralevich
6556921a1e Merge "Hide usb mode chooser dialog after disconnected"
am: b913bf926e

* commit 'b913bf926e04280d0864cc36c759eddf88cf8b21':
  Hide usb mode chooser dialog after disconnected
2015-12-23 10:58:56 -08:00
Nick Kralevich
b913bf926e Merge "Hide usb mode chooser dialog after disconnected" 2015-12-23 18:55:09 +00:00
Mark Salyzyn
285afa8d15 Settings: Add option to disable logging
Bug: 26178938
Change-Id: I64263595705ceb1e6816e3cdfa982929877ff5b2
2015-12-22 15:14:56 -08:00
Svetoslav
58d5d785ca DO NOT MERGE Modify system settings: incorrect UI state am: 119d589ea5
am: 6e88d0b02f

* commit '6e88d0b02f48d8b4c87f197ccca927373df99758':
  DO NOT MERGE Modify system settings: incorrect UI state
2015-12-22 11:44:00 -08:00
Svetoslav
6e88d0b02f DO NOT MERGE Modify system settings: incorrect UI state
am: 119d589ea5

* commit '119d589ea5aa9c2ccc5164279d718a20d0865f20':
  DO NOT MERGE Modify system settings: incorrect UI state
2015-12-22 19:42:06 +00:00
Svetoslav
119d589ea5 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: I3d726a66c7f9857bc7dbd5946fdbb8f340c6eb4d
(cherry picked from commit 356fb2d10d)
2015-12-22 19:38:30 +00:00
Du, Changbin
93df36a1c7 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>
2015-12-22 15:26:13 +08:00
Henrik Baard
2984b2b791 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
2015-12-14 12:23:10 +01:00
Geoff Mendal
6419a4a6e2 Import translations. DO NOT MERGE am: 1cb1ad2c55 -s ours
am: ab3b13d0ed  -s ours

* commit 'ab3b13d0edce3b89bd5836f8a9446a427b6c6acc':
  Import translations. DO NOT MERGE
2015-12-11 18:07:11 -08:00
Geoff Mendal
ab3b13d0ed Import translations. DO NOT MERGE
am: 1cb1ad2c55  -s ours

* commit '1cb1ad2c55d1997dd5c31e5aed5062a4d395238f':
  Import translations. DO NOT MERGE
2015-12-11 18:04:00 -08:00
Geoff Mendal
1cb1ad2c55 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 26151591
Change-Id: Ie838ac1e234ebb27ad5be9fde95d25173a571e78
2015-12-11 17:58:32 -08:00
Geoff Mendal
4f86f6274a Revert "Import translations. DO NOT MERGE" am: 7bafd5ee2f -s ours
am: d2981b099e  -s ours

* commit 'd2981b099e15e9f39ed8c69d06860ae74ecb497c':
  Revert "Import translations. DO NOT MERGE"
2015-12-11 17:47:41 -08:00
Geoff Mendal
d2981b099e Revert "Import translations. DO NOT MERGE"
am: 7bafd5ee2f  -s ours

* commit '7bafd5ee2f2c6fb3c3e3f456e855ab34c06f7c91':
  Revert "Import translations. DO NOT MERGE"
2015-12-11 17:44:31 -08:00
Geoff Mendal
7bafd5ee2f Revert "Import translations. DO NOT MERGE"
This reverts commit df57be8aef.

Change-Id: Ie47ab587c4ea43cdd6fb608b0c5dfe26e534ab93
2015-12-12 01:42:00 +00:00
Geoff Mendal
819e07fbbe Import translations. DO NOT MERGE am: df57be8aef -s ours
am: bc84451452  -s ours

* commit 'bc844514522870bd3e70bba85a11ea824ff59e5b':
  Import translations. DO NOT MERGE
2015-12-11 16:36:21 -08:00
Geoff Mendal
bc84451452 Import translations. DO NOT MERGE
am: df57be8aef  -s ours

* commit 'df57be8aef6dd1760e72d7f76490048eeb425a3e':
  Import translations. DO NOT MERGE
2015-12-11 16:30:09 -08:00
Geoff Mendal
df57be8aef Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 26151591
Change-Id: If1d7f9358c3fa2e17826385ea967c09442f08285
2015-12-11 16:05:26 -08:00
Hyejin Kim
00bc7567b8 Add IMS settings to Network setting reset am: 623852f6c7
am: c46bbd6373

* commit 'c46bbd637345e7dcfd637b1ba76896890e13bf5a':
  Add IMS settings to Network setting reset
2015-12-06 18:42:11 +00:00
Hyejin Kim
c46bbd6373 Add IMS settings to Network setting reset
am: 623852f6c7

* commit '623852f6c772b7685abade493b304da1f71b4c00':
  Add IMS settings to Network setting reset
2015-12-06 18:37:50 +00:00
Svetoslav Ganov
994779c61e Merge "[DO NOT MERGE] Modify system settings: incorrect UI state" am: c4321c7e6c -s ours
am: 142193550e  -s ours

* commit '142193550e6b9844631d4e34dda42e76424fed83':
  [DO NOT MERGE] Modify system settings: incorrect UI state
2015-12-03 22:48:09 +00:00
Svetoslav Ganov
142193550e 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
2015-12-03 22:45:05 +00:00
Svetoslav Ganov
c4321c7e6c Merge "[DO NOT MERGE] Modify system settings: incorrect UI state" 2015-12-03 22:38:54 +00:00
Svetoslav
28daa67fcb [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
2015-12-03 14:36:36 -08:00
Hyejin Kim
623852f6c7 Add IMS settings to Network setting reset
Add the factory reset function to be used to reset IMS settings

BUG=25300757
Change-Id: I78d2e919418b7a0b42f56af3442d7d98afe40d77
2015-12-01 10:59:25 -08:00
Geoff Mendal
058c71f15d Import translations. DO NOT MERGE am: 2102350ea3 -s ours am: 75dd183bf7 -s ours am: 74e9c3d348 -s ours am: 39be1461a8 -s ours
am: bdbd6da522  -s ours

* commit 'bdbd6da522691b4cd7517e12e725676f2ee08983':
  Import translations. DO NOT MERGE
2015-11-20 04:44:18 +00:00
Geoff Mendal
bdbd6da522 Import translations. DO NOT MERGE am: 2102350ea3 -s ours am: 75dd183bf7 -s ours am: 74e9c3d348 -s ours
am: 39be1461a8  -s ours

* commit '39be1461a876a4442e11dc26cff14ec80273baf0':
  Import translations. DO NOT MERGE
2015-11-20 01:24:46 +00:00
Geoff Mendal
39be1461a8 Import translations. DO NOT MERGE am: 2102350ea3 -s ours am: 75dd183bf7 -s ours
am: 74e9c3d348  -s ours

* commit '74e9c3d34840c6a33afd7cef4b8fb0e1b73c9a93':
  Import translations. DO NOT MERGE
2015-11-20 01:19:50 +00:00
Geoff Mendal
74e9c3d348 Import translations. DO NOT MERGE am: 2102350ea3 -s ours
am: 75dd183bf7  -s ours

* commit '75dd183bf7b99c995fe773e7b53a6604a6b53512':
  Import translations. DO NOT MERGE
2015-11-20 01:14:23 +00:00
Geoff Mendal
75dd183bf7 Import translations. DO NOT MERGE
am: 2102350ea3  -s ours

* commit '2102350ea33d8bbed50d9447889876fa295b3e8a':
  Import translations. DO NOT MERGE
2015-11-20 01:09:14 +00:00
Geoff Mendal
2102350ea3 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Change-Id: Ic959d8e81d2c9ab397ec7f84d78900631b92346d
2015-11-20 01:02:07 +00:00
Russell Brenner
549379737d Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b am: 8e4f6fbc2e am: 5950ff1d69 am: 2b29501039 am: f0d538f08d
am: ebc5086d15

* commit 'ebc5086d15bc1be602dfcd31925000e8c6184f16':
  Block developer settings during SUW
2015-11-17 20:40:50 +00:00
Russell Brenner
4868199d28 [DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: 97759fa8d1 am: 6967df6421 -s ours am: 439033dd93 am: 38e932dc81 am: 8199c3028c
am: bcf3b75f57

* commit 'bcf3b75f5732cc270d1974edd2cf1ed48863cb31':
  [DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 20:40:38 +00:00
Russell Brenner
ebc5086d15 Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b am: 8e4f6fbc2e am: 5950ff1d69 am: 2b29501039
am: f0d538f08d

* commit 'f0d538f08da7c45e545e51e93373afe38cbd518f':
  Block developer settings during SUW
2015-11-17 20:32:03 +00:00
Russell Brenner
bcf3b75f57 [DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: 97759fa8d1 am: 6967df6421 -s ours am: 439033dd93 am: 38e932dc81
am: 8199c3028c

* commit '8199c3028c05cd9c85b6f26fe656518f536bda69':
  [DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 20:31:54 +00:00
Russell Brenner
f0d538f08d Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b am: 8e4f6fbc2e am: 5950ff1d69
am: 2b29501039

* commit '2b295010392c532a47e02e5b003459a50d6d5a62':
  Block developer settings during SUW
2015-11-17 20:23:22 +00:00
Russell Brenner
8199c3028c [DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: 97759fa8d1 am: 6967df6421 -s ours am: 439033dd93
am: 38e932dc81

* commit '38e932dc816fe7aff6443bfa5648743f527aa097':
  [DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 20:23:06 +00:00
Russell Brenner
2b29501039 Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b am: 8e4f6fbc2e
am: 5950ff1d69

* commit '5950ff1d69ca27c09569f40862201ede261c831e':
  Block developer settings during SUW
2015-11-17 20:14:22 +00:00
Russell Brenner
38e932dc81 [DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: 97759fa8d1 am: 6967df6421 -s ours
am: 439033dd93

* commit '439033dd93417b98acff392865166503a507ff30':
  [DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 20:14:10 +00:00
Russell Brenner
5950ff1d69 Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b
am: 8e4f6fbc2e

* commit '8e4f6fbc2ee74a3f7ede9d63f5a2d9c0ce153f70':
  Block developer settings during SUW
2015-11-17 20:05:54 +00:00
Russell Brenner
439033dd93 [DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: 97759fa8d1
am: 6967df6421  -s ours

* commit '6967df642114a9c84d993cfd544d5a32f04c26b1':
  [DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 20:05:43 +00:00
Russell Brenner
8e4f6fbc2e Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed
am: afe5eada5b

* commit 'afe5eada5bbc6d961c81e881be1f12b1bfcc83e4':
  Block developer settings during SUW
2015-11-17 19:57:00 +00:00
Russell Brenner
6967df6421 [DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79
am: 97759fa8d1

* commit '97759fa8d1710c0ac87cd24c69a3d1f161ac3ec3':
  [DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 19:56:48 +00:00
Russell Brenner
afe5eada5b Merge "Block developer settings during SUW" into lmp-mr1-dev
am: 56d630a3ed

* commit '56d630a3eda390d8514c1e1d9f36c95e7808d1dd':
  Block developer settings during SUW
2015-11-17 19:53:17 +00:00
Russell Brenner
97759fa8d1 [DO NOT MERGE] Preserve FRP lock if wiped during SUW
am: 14bf226c79

* commit '14bf226c79ee16fc5dd502d81e12bf18b932f39e':
  [DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 19:51:09 +00:00
Russell Brenner
7285e2c2fc Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631de am: 2075d98be6 am: 7d44fe6fdb
am: 6a7ff3186b

* commit '6a7ff3186b6ad03a08801b8bb3fff5a30185eb4d':
  Preserve FRP lock if wiped during SUW
2015-11-17 01:47:46 +00:00
Russell Brenner
6a7ff3186b Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631de am: 2075d98be6
am: 7d44fe6fdb

* commit '7d44fe6fdb95dce08e4c8cd1a1c1a1c8f3ea4a63':
  Preserve FRP lock if wiped during SUW
2015-11-17 01:37:51 +00:00