Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
199,326 Commits 3 Branches 0 Tags
79fd5c4559f57be32b64e0e71c53e673fda170c4
Commit Graph

12869 Commits

Author SHA1 Message Date
Geoff Mendal
79fd5c4559 Import translations. DO NOT MERGE 
Change-Id: Ibf82892f48ab6cc0b5aa3eb2460859afa8e44332
Auto-generated-cl: translation import
 2015-08-19 11:00:52 -05:00
Jim Miller
e0507bbbf9 Reset fingerprint lockout timer when strong auth is used. 
Fixes bug 22565462

Change-Id: I4842877839845e7fe103396d8ca8104928568c04
 2015-08-18 13:01:31 -07:00
Amit Mahajan
ebadc46132 am dd8df041: Merge "Setting config_use_sim_language_file to false for 334-020." into mnc-dev 
* commit 'dd8df0418ee4a873efd66ada577c5a2b21b3de5d':
  Setting config_use_sim_language_file to false for 334-020.
 2015-08-17 23:21:25 +00:00
Amit Mahajan
dd8df0418e Merge "Setting config_use_sim_language_file to false for 334-020." into mnc-dev 2015-08-17 23:06:13 +00: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
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
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 3a24898f55.

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
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
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
Amit Mahajan
9fd96df640 Setting config_use_sim_language_file to false for 334-020. 
Logs seen with a regular customer sim indicate that language is
not set correctly on this carrier's sim. This config will avoid
using that language as default.

Bug: 23111193
Change-Id: I831eabab3c3a6ea8bb4efe7fb1cb35a71c88b5ce
 2015-08-12 10:27:15 -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
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
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
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
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
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
89718b2bf8 am be948f5a: Merge "Removing tethering overlay for mcc202-mnc05 (VF Greece)." into mnc-dev 
* commit 'be948f5a9f519210c5522060ec9ee3bc77eb077e':
  Removing tethering overlay for mcc202-mnc05 (VF Greece).
 2015-08-06 01:43:18 +00:00
Geoff Mendal
f71c108b3c Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 22842106
Change-Id: I473bc0dc200e1eec3bd0f907526fcf808ee86e36
 2015-08-05 17:54:19 -07:00
Amit Mahajan
be948f5a9f Merge "Removing tethering overlay for mcc202-mnc05 (VF Greece)." into mnc-dev 2015-08-05 23:09:58 +00:00
Amit Mahajan
69b55b5f03 Removing tethering overlay for mcc202-mnc05 (VF Greece). 
Bug: 22942869
Change-Id: I1d80ab3a66f7e1cd8e497b0d4236f80b0a126228
 2015-08-05 11:11:56 -07:00
Mitchell Wills
b0e9e731f2 am bce3eb22: Merge "Fix incorrect default wifi power draw values" into mnc-dev 
* commit 'bce3eb22afcd57b7f1bdde26030f8c44bb885a4b':
  Fix incorrect default wifi power draw values
 2015-08-05 17:09:22 +00:00
Geoff Mendal
f5262e5215 Import translations. DO NOT MERGE 
Change-Id: I8fe682739483119d031a29310670d8abfc81bedd
Auto-generated-cl: translation import
 2015-08-05 10:48:06 -05:00
Mitchell Wills
083e1d9e4b Fix incorrect default wifi power draw values 
Bug: 22848679
Change-Id: Ief4e3e05b051b93efbe30fdc8903cce6765d2ed8
 2015-08-04 10:28:16 -07:00
Alan Viverette
e0d8a6ff60 am 7b4170fa: Merge "Update Material link text to be colorAccent" into mnc-dev 
* commit '7b4170fa7f944e4cd73f1e82b56b4467de60d96c':
  Update Material link text to be colorAccent
 2015-08-03 20:33:05 +00:00
Alan Viverette
8c558f3d43 Update Material link text to be colorAccent 
Bug: 22918108
Change-Id: I29b795b4c8d2a017dcaca1a9b65705eafaf2140c
 2015-08-03 12:42:14 -04:00
Geoff Mendal
9c0cbdb8be Import translations. DO NOT MERGE 
Change-Id: I1e66c1b10c0bd0e13369aeb3a24c219afc45d4e9
Auto-generated-cl: translation import
 2015-08-03 11:02:23 -05:00
Geoff Mendal
f27e5c81b0 Import translations. DO NOT MERGE 
Change-Id: I6fa255b9e0118457ee08fb14a503504631889c9d
Auto-generated-cl: translation import
 2015-08-01 00:29:06 -05:00
Dianne Hackborn
9b36f526dd am c1836bb0: Merge "Change MNC codename to just M." into mnc-dev 
* commit 'c1836bb0f1bf3e5ef0911719525da0bab3e53507':
  Change MNC codename to just M.
 2015-07-31 19:42:11 +00:00
Dianne Hackborn
c1836bb0f1 Merge "Change MNC codename to just M." into mnc-dev 2015-07-31 17:11:58 +00:00
Geoff Mendal
84ddee2e53 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 22826906
Change-Id: I1c6a84cee28d64dad3b53e727252d237824b673d
 2015-07-30 19:15:21 -07:00
Geoff Mendal
e0217b1a9a Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 22826906
Change-Id: If1cb05eb42e8e5bd789cdb257dfc3498e4479890
 2015-07-30 19:12:14 -07:00
Fyodor Kupolov
f9fdb08caa am 4988378c: Merge "Introduced android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev 
* commit '4988378cd0f1bb6cdd83f797d10fd45105672296':
  Introduced android.permission.PEERS_MAC_ADDRESS permission
 2015-07-30 20:58:29 +00:00
Fyodor Kupolov
4988378cd0 Merge "Introduced android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev 2015-07-30 20:50:04 +00:00
Alan Viverette
b3dba59f3a am c1d5b6c1: Merge "Move padding from navigation and overflow icons to Toolbar" into mnc-dev 
* commit 'c1d5b6c18c3b92708958daa998da2ec55adce00e':
  Move padding from navigation and overflow icons to Toolbar
 2015-07-30 15:02:35 +00:00
Alan Viverette
c1d5b6c18c Merge "Move padding from navigation and overflow icons to Toolbar" into mnc-dev 2015-07-30 14:50:07 +00:00