Dan Sandler
87c1e1b8a1
am 415c6cb2: am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev
...
* commit '415c6cb2358a0ad4821ec58c287b1de94de78d72':
"I tried to think of the most harmless thing."
2015-08-16 02:48:19 +00:00
Geoff Mendal
567139efb3
am a5e012e6: Merge commit \'8dcda391c79e8c2fd20a87834f1f61645aa771ea\' into cw-e-dev
...
* commit 'a5e012e6236aaeabd6d00fa7c6b29ec146ffd764':
resolved conflicts for merge of 8ad3e817 to mnc-dr-dev
2015-08-16 02:39:19 +00:00
Dan Sandler
415c6cb235
am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev
...
* commit '8c8387d235b780c4a78a54d8240fe1f5a17c6af5':
"I tried to think of the most harmless thing."
2015-08-16 02:36:17 +00:00
Geoff Mendal
a5e012e623
Merge commit '8dcda391c79e8c2fd20a87834f1f61645aa771ea' into cw-e-dev
2015-08-15 19:25:34 -07:00
Dan Sandler
8c8387d235
resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev
...
Change-Id: I5b47fdbb8a9712c104f12c25b80063048849cebd
2015-08-15 18:33:29 -04:00
Daniel Sandler
8dcda391c7
resolved conflicts for merge of 8ad3e817 to mnc-dr-dev
...
Change-Id: Ic4ea07a337b8d831f281b0a4048d0b4132597aa7
2015-08-15 00:03:09 -07:00
Dan Sandler
deafeedc81
"I tried to think of the most harmless thing."
...
Bug: 21984798
Change-Id: I33ffabb72c831ff814363601a82ac9a388cb1e99
2015-08-14 15:25:55 -04:00
Mike Dodd
80ca7d2794
am 28918812: am 045ffe31: am 226ae04d: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev
...
* commit '28918812028f69a6e2c81f56b31724edd35307ce':
Set default SMS/MMS app to com.android.messaging (new AOSP app).
2015-08-13 15:36:22 +00:00
Mike Dodd
2891881202
am 045ffe31: am 226ae04d: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev
...
* commit '045ffe31056b340fb962c4fef3ed3dbf00b5d251':
Set default SMS/MMS app to com.android.messaging (new AOSP app).
2015-08-13 15:30:12 +00:00
Mike Dodd
045ffe3105
am 226ae04d: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev
...
* commit '226ae04df4b3570d11b66d52a404b2c8b2ac50db':
Set default SMS/MMS app to com.android.messaging (new AOSP app).
2015-08-13 15:22:48 +00:00
Mike Dodd
4ec593928e
Set default SMS/MMS app to com.android.messaging (new AOSP app).
...
b/23110861
Change-Id: Ifcdcfdea4d19875bf32ec19d245abc5e5a582b4c
2015-08-12 15:44:05 -07:00
Mike Dodd
4a6b0c93f8
am 79fdfecb: am 954ca10e: am ad285c16: Merge "Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."" into mnc-dev
...
* commit '79fdfecb94f36844d5cc878a2e4199ec5010837a':
Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."
2015-08-12 19:14:24 +00:00
Mike Dodd
79fdfecb94
am 954ca10e: am ad285c16: Merge "Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."" into mnc-dev
...
* commit '954ca10eeee254c923a53e0632d1ec84c10aee8b':
Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."
2015-08-12 19:06:13 +00:00
Mike Dodd
954ca10eee
am ad285c16: Merge "Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."" into mnc-dev
...
* commit 'ad285c169fd55bee8feef6e076a6710c357043e5':
Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."
2015-08-12 18:59:05 +00:00
Mike Dodd
719192c946
Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."
...
This reverts commit 3a24898f5553e72589eaba3aeb5ef8f63909dd64.
Change-Id: I86de9a7fe9f72748c7ac33d9df7fd1fbd8007f7c
2015-08-12 18:48:31 +00:00
Geoff Mendal
9e47ba6e06
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-08-12 18:03:39 +00:00
Mike Dodd
ae878c851f
am 6379ddbe: am 3f5d76dd: am 7f2f96cc: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev
...
* commit '6379ddbe5a4b3d495d5cab3ff22c61c16ff2b4f7':
Set default SMS/MMS app to com.android.messaging (new AOSP app).
2015-08-12 18:00:25 +00:00
Geoff Mendal
f23b2966e1
Import translations. DO NOT MERGE
...
Change-Id: I4fc5ccb494ee7b446489bcee8ecd733790c92779
Auto-generated-cl: translation import
2015-08-12 10:51:55 -07:00
Mike Dodd
6379ddbe5a
am 3f5d76dd: am 7f2f96cc: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev
...
* commit '3f5d76dd5ee4e73d69a6e6ce0d5f5c70c05f789f':
Set default SMS/MMS app to com.android.messaging (new AOSP app).
2015-08-12 17:51:17 +00:00
Mike Dodd
3f5d76dd5e
am 7f2f96cc: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev
...
* commit '7f2f96cce3f1663e3c1dccdde2c0f196b2b16e72':
Set default SMS/MMS app to com.android.messaging (new AOSP app).
2015-08-12 17:43:55 +00:00
Zach Johnson
5d3a382aa4
am 6d7af4b7: Merge "DO NOT MERGE Allow a custom component to handle network policy notifications" into cw-e-dev
...
* commit '6d7af4b795501edfc4558163b8566a8694830a02':
DO NOT MERGE Allow a custom component to handle network policy notifications
2015-08-11 23:27:05 +00:00
Zach Johnson
143ebdb94e
DO NOT MERGE Allow a custom component to handle network policy notifications
...
Broadcasts information about network policy notifications
to a custom component, if specified, so it can handle them.
Also exposes an API to snooze warning notifications.
Change-Id: Ic89478fa437861e2d4b6a9443858bcaf12122fba
2015-08-11 15:36:06 -07:00
Mike Dodd
3a24898f55
Set default SMS/MMS app to com.android.messaging (new AOSP app).
...
b/23110861
Change-Id: I5ac753264222cb617027cf13527178a7e754a80b
2015-08-11 13:14:53 -07:00
Dianne Hackborn
afacdbe1e8
am 09e77852: am 5cf89a01: am b2b02092: Merge "Fix issue #23037899 : Support for Battery Optimization permission + Dialog" into mnc-dev
...
* commit '09e77852d8c25854894358789807a73c3e79ddf0':
Fix issue #23037899 : Support for Battery Optimization permission + Dialog
2015-08-11 00:35:18 +00:00
Dianne Hackborn
09e77852d8
am 5cf89a01: am b2b02092: Merge "Fix issue #23037899 : Support for Battery Optimization permission + Dialog" into mnc-dev
...
* commit '5cf89a011932f1af9361e7b713e33ff5c5af3e61':
Fix issue #23037899 : Support for Battery Optimization permission + Dialog
2015-08-11 00:28:20 +00:00
Dianne Hackborn
5cf89a0119
am b2b02092: Merge "Fix issue #23037899 : Support for Battery Optimization permission + Dialog" into mnc-dev
...
* commit 'b2b020922fb51b88d34a6478209fc232702de318':
Fix issue #23037899 : Support for Battery Optimization permission + Dialog
2015-08-11 00:19:44 +00:00
Dianne Hackborn
c7b57b1e65
Fix issue #23037899 : Support for Battery Optimization permission + Dialog
...
New permission, new Intent action.
Change-Id: I1d9ba55be8f72074e29d33ad7a0a12a820bbac39
2015-08-10 14:52:52 -07:00
Geoff Mendal
c21a0fa940
Import translations. DO NOT MERGE
...
Change-Id: Ie2a8186b906ad14696892948248a0f7e47a4a744
Auto-generated-cl: translation import
2015-08-10 11:00:18 -07:00
Geoff Mendal
5d4994b498
Import translations. DO NOT MERGE
...
Change-Id: I1c9149946ceaaa41d36a305c338336f27d0224d3
Auto-generated-cl: translation import
2015-08-08 11:13:47 -05:00
Svetoslav Ganov
546a34490f
am e12a685c: am 02d6c013: am 90b030ba: Merge "Do not show removed permissions in the UI - framework" into mnc-dev
...
* commit 'e12a685c37786f3b11da77ac6d20ee7d8d8f85fe':
Do not show removed permissions in the UI - framework
2015-08-08 07:10:17 +00:00
Svetoslav Ganov
e12a685c37
am 02d6c013: am 90b030ba: Merge "Do not show removed permissions in the UI - framework" into mnc-dev
...
* commit '02d6c013e4be4b5e09562c922506c1153347d161':
Do not show removed permissions in the UI - framework
2015-08-08 07:03:16 +00:00
Svetoslav Ganov
02d6c013e4
am 90b030ba: Merge "Do not show removed permissions in the UI - framework" into mnc-dev
...
* commit '90b030bae8cc1f13da7948fef4aff1d171a2885a':
Do not show removed permissions in the UI - framework
2015-08-08 06:57:32 +00:00
Svet Ganov
3e0be7440b
Do not show removed permissions in the UI - framework
...
bug:23043018
Change-Id: Ia5cf49f299eda627d9fde2b34498812afcb3a6d5
2015-08-07 23:06:04 -07:00
Billy Lau
99271a3995
am 9751afcf: am 26ab6ed3: am 70f998e5: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
...
* commit '9751afcfbc273fecd9f1eafadd25c85e57b4046b':
Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
2015-08-07 22:40:53 +00:00
Billy Lau
9751afcfbc
am 26ab6ed3: am 70f998e5: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
...
* commit '26ab6ed3efd9bc55e342caabade46d00f8304240':
Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
2015-08-07 22:34:20 +00:00
Billy Lau
26ab6ed3ef
am 70f998e5: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
...
* commit '70f998e57df2b3ed79331669a93a0ba314f25e7d':
Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
2015-08-07 22:22:24 +00:00
Billy Lau
70f998e57d
Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
2015-08-07 22:16:03 +00:00
Billy Lau
a7238a397d
Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
...
Merge the CHANGE_NETWORK_STATE permission with WRITE_SETTINGS.
AndroidManifest.xml:
Raised the protection level of CHANGE_NETWORK_STATE permission from
normal to signature|appops and pre23|preinstall for compatibility
provider/Settings:
Wrote new helper methods to check if app is allowed to change network
state.
ConnectivityManager.java & ConnectivityService.java:
Replace enforcement checks for CHANGE_NETWORK_STATE with
checkAndNoteChangeNetworkStateOperations instead.
Change-Id: If8c2dd3c76a5324ca43f1d90fa17973216c2bcc5
2015-08-07 19:29:51 +01:00
Michael Wright
1c4c740d7f
am 97e77627: Merge commit \'9dd2663d\' into mm
...
* commit '97e776278271b3ce90aadb170045283c6bd7debb':
DO NOT MERGE. Add new media navigation keys.
2015-08-07 18:24:16 +00:00
Michael Wright
97e7762782
Merge commit '9dd2663d' into mm
...
Change-Id: Idf37dbc3bba970817e6620fe0129e54e86f553d5
2015-08-07 19:13:34 +01:00
Michael Wright
9dd2663db4
am d7255cfb: Merge "DO NOT MERGE. Add new media navigation keys." into mnc-dev
...
* commit 'd7255cfb1cf8dc7249632d93d68daac8cc2c7b9c':
DO NOT MERGE. Add new media navigation keys.
2015-08-07 17:53:17 +00:00
Michael Wright
d7255cfb1c
Merge "DO NOT MERGE. Add new media navigation keys." into mnc-dev
2015-08-07 16:52:27 +00:00
Svetoslav Ganov
5ed0338499
am 1f514608: am 5a624aad: am 38d30dc5: Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev
...
* commit '1f514608875282fece4198bdf502e0b0060b8fc8':
Immediately kill a shared user process on a permission revocation.
2015-08-07 15:48:30 +00:00
Svetoslav Ganov
1f51460887
am 5a624aad: am 38d30dc5: Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev
...
* commit '5a624aad5faa0a71ce6495671caac1ccd90544ba':
Immediately kill a shared user process on a permission revocation.
2015-08-07 15:40:35 +00:00
Svetoslav Ganov
5a624aad5f
am 38d30dc5: Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev
...
* commit '38d30dc547825bdde2756f588692063a28749e8d':
Immediately kill a shared user process on a permission revocation.
2015-08-07 15:33:48 +00:00
Svetoslav Ganov
38d30dc547
Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev
2015-08-07 15:27:49 +00:00
Michael Wright
600b984760
DO NOT MERGE. Add new media navigation keys.
...
Bug: 22059484
Change-Id: Ifd8fd18178fed45ead2980b957dd1d177e40f165
2015-08-07 14:46:05 +01:00
Svetoslav
aa41add33b
Immediately kill a shared user process on a permission revocation.
...
1. When a permission is revoked we kill the app immediately but do
not do an immediate kill for shared uid processes. This fixes it.
2. Remove system APIs that are used only by the package installer.
bug:22984670
Change-Id: I3d4ae52ea8679f894aa7c5972941263903479183
2015-08-06 18:47:41 -07:00
Amit Mahajan
b7c419919f
am e992c927: am 89718b2b: am be948f5a: Merge "Removing tethering overlay for mcc202-mnc05 (VF Greece)." into mnc-dev
...
* commit 'e992c927ebba4bed96f86388f1601e3cc3c7c9e3':
Removing tethering overlay for mcc202-mnc05 (VF Greece).
2015-08-06 02:40:05 +00:00
Amit Mahajan
e992c927eb
am 89718b2b: am be948f5a: Merge "Removing tethering overlay for mcc202-mnc05 (VF Greece)." into mnc-dev
...
* commit '89718b2bf8f0449b122bf1c8aba039c6a0575c21':
Removing tethering overlay for mcc202-mnc05 (VF Greece).
2015-08-06 01:57:58 +00:00