Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
174,103 Commits 3 Branches 0 Tags
8923735f280784d85edcb2ed23704cd38df966fc
Commit Graph

2112 Commits

Author SHA1 Message Date
Junda Liu
5b7dbca7ca am 829519df: Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev automerge: 2eb5a5f automerge: 5716ebe 
* commit '829519dfaab9f2c13492d97556a95300a6908ea4':
  Add HIDE_CARRIER_NETWORK_SETTINGS global setting.
 2014-11-12 03:44:44 +00:00
Junda Liu
829519dfaa Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev automerge: 2eb5a5f 
automerge: 5716ebe

* commit '5716ebe50debab01ede01b2f99abde85a250c82c':
  Add HIDE_CARRIER_NETWORK_SETTINGS global setting.
 2014-11-12 03:12:51 +00:00
Junda Liu
2eb5a5f727 Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev 2014-11-12 00:05:20 +00:00
Junda Liu
bbdc1c0e04 Add HIDE_CARRIER_NETWORK_SETTINGS global setting. 
Also remove hidden APIs to get/set the preference.

Bug: b/17673255
Change-Id: I8957b0380bf617c953f6665cbfdcc77c3be78411
 2014-11-07 12:11:52 -08:00
Ignacio Solla
0aba408a81 am ad87ec5b: am cf045ea8: am 803908b0: Merge "[WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting." into lmp-mr1-dev 
* commit 'ad87ec5bbaa911c364a1b9626c7e89de71e47552':
  [WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting.
 2014-11-07 10:14:53 +00:00
Ignacio Solla
ad87ec5bba am cf045ea8: am 803908b0: Merge "[WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting." into lmp-mr1-dev 
* commit 'cf045ea8e4b91ac662d0aff74df429a2569d8e46':
  [WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting.
 2014-11-07 10:08:22 +00:00
Ignacio Solla
803908b0db Merge "[WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting." into lmp-mr1-dev 2014-11-07 09:44:59 +00:00
Jason Monk
52eb811a44 am 8efeae7e: am 2e647efe: Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev automerge: 5c69f5b 
* commit '8efeae7eb4da19bd3dcf1a5013e3011d50f2ca42':
  Move LOCK_TO_APP_EXIT_LOCKED from System to Secure
 2014-11-03 14:48:48 +00:00
Jason Monk
8efeae7eb4 am 2e647efe: Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev 
automerge: 5c69f5b

* commit '5c69f5b276b65bd4b8000d2b6e56baddccf89846':
  Move LOCK_TO_APP_EXIT_LOCKED from System to Secure
 2014-11-03 14:42:18 +00:00
Jason Monk
2e647efe01 Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev 2014-11-03 14:36:02 +00:00
Amith Yamasani
b9a7f37e71 am 84df64d4: am 8079a812: Merge "Backup and restore battery saver trigger level" into lmp-mr1-dev automerge: 80e5f45 
* commit '84df64d4009aa42ccca1bb4c4b03396fe441f990':
  Backup and restore battery saver trigger level
 2014-10-31 20:04:24 +00:00
Amith Yamasani
84df64d400 am 8079a812: Merge "Backup and restore battery saver trigger level" into lmp-mr1-dev 
automerge: 80e5f45

* commit '80e5f45979416c0bee487725eaf4078b6ba42769':
  Backup and restore battery saver trigger level
 2014-10-31 20:00:57 +00:00
Jason Monk
94cfd9d7c4 Move LOCK_TO_APP_EXIT_LOCKED from System to Secure 
To prepare for controlling from settings.

While here, add lock to app settings to backups.

Bug: 16957435
Change-Id: I059140cd07a7a0d5ceb4e0bfe5e0176cb96629d3
 2014-10-31 14:47:13 -04:00
Amith Yamasani
94005240ec Backup and restore battery saver trigger level 
Bug: 17836827
Change-Id: Icb6bf071a0966a8fb9a03fadd0f8b3daa5ad11f8
 2014-10-31 11:35:13 -07:00
Ignacio Solla
c418f07993 [WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting. 
BUG:18152150

Change-Id: Id5c788bc766d7c45c3f9c96837d5b2824a601f9e
 2014-10-31 12:06:14 +00:00
John Spurlock
57177c75ea am 68fdbd01: am a0adb0bd: am fc2b9039: Merge "Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS." into lmp-mr1-dev 
* commit '68fdbd01798dad380581d02c5b9d229aecb10ef0':
  Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS.
 2014-10-31 00:36:32 +00:00
John Spurlock
68fdbd0179 am a0adb0bd: am fc2b9039: Merge "Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS." into lmp-mr1-dev 
* commit 'a0adb0bd46389b7ac0474b7727cdbdb36d0d48a0':
  Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS.
 2014-10-31 00:28:28 +00:00
Chris Wren
e9b498fb41 am e52d0d68: am 402152d6: Merge "Reveal notification listener settings APIs." into lmp-mr1-dev automerge: b3239da 
* commit 'e52d0d68c4c192340ef48a2c750babfd48c090e3':
  Reveal notification listener settings APIs.
 2014-10-30 19:24:29 +00:00
Chris Wren
e52d0d68c4 am 402152d6: Merge "Reveal notification listener settings APIs." into lmp-mr1-dev 
automerge: b3239da

* commit 'b3239da9a0c3c75e5aea5e961cd8ed4fc627d42b':
  Reveal notification listener settings APIs.
 2014-10-30 19:17:17 +00:00
Shishir Agrawal
e6d4f45611 am 060afd45: am c8787bec: Merge "Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37" into lmp-mr1-dev automerge: 47fa171 
* commit '060afd455fa8260c7ea262d0c1d2d555bc6771ea':
  Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37
 2014-10-30 19:10:37 +00:00
Shishir Agrawal
060afd455f am c8787bec: Merge "Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37" into lmp-mr1-dev 
automerge: 47fa171

* commit '47fa1715221b50334ca1df1eab148cd50eeef608':
  Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37
 2014-10-30 19:04:24 +00:00
John Spurlock
734666657f Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS. 
Bug: 18186862
Change-Id: I685934118a53ba2135eaf0872564e58069de2a30
 2014-10-30 13:42:05 -04:00
Chris Wren
402152d673 Merge "Reveal notification listener settings APIs." into lmp-mr1-dev 2014-10-29 14:54:18 +00:00
Chris Wren
8326a8a945 Reveal notification listener settings APIs. 
Fix the value of the ACTION_NOTIFICATION_LISTENER_SETTINGS constant
to be the actual value to which the settings app responds.

Bug: 10023397
Change-Id: I80a0ff76406a3b0b893793f9a63ffa563dae103b
 2014-10-28 15:54:53 -04:00
Shishir Agrawal
1ae88e3420 Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37 
The change above deleted these lines by mistake.

Bug: 18153840
Change-Id: I010c36f227e313cdf00a363f1f851e61a4db1af4
 2014-10-28 11:19:14 -07:00
Jeff Sharkey
6007da7b73 am a148a0dc: Merge "Drop DEV network stats to save RAM." into lmp-mr1-dev automerge: 49c1527 automerge: a5921b9 
* commit 'a148a0dc667ac35599a35a46f2232f0128269d78':
  Drop DEV network stats to save RAM.
 2014-10-28 07:16:34 +00:00
Jeff Sharkey
a148a0dc66 Merge "Drop DEV network stats to save RAM." into lmp-mr1-dev automerge: 49c1527 
automerge: a5921b9

* commit 'a5921b9b79a1d95e8a41bd74998cab82b153cb0a':
  Drop DEV network stats to save RAM.
 2014-10-28 00:27:07 +00:00
Jeff Sharkey
5274dcc85d Drop DEV network stats to save RAM. 
We migrated to pure XT stats a long time ago, so we no longer need
to keep the DEV stats cached in RAM.  This saves ~250KB on a typical
device.

Bug: 18118003
Change-Id: I3d84ba47073fa3500454784afc956c8e53404492
 2014-10-24 13:15:15 -07:00
Pavel Zhamaitsiak
7c06f9b5e1 am 34e4dc4b: am b01a5979: am c8a09d54: Merge "Separate VoLTE and VT configurations to enable devices/carriers to have VoLTE without VT." into lmp-mr1-dev 
* commit '34e4dc4b09045c882ad7a30b26d78d787d74c264':
  Separate VoLTE and VT configurations to enable devices/carriers to have VoLTE without VT.
 2014-10-23 22:17:52 +00:00
Pavel Zhamaitsiak
34e4dc4b09 am b01a5979: am c8a09d54: Merge "Separate VoLTE and VT configurations to enable devices/carriers to have VoLTE without VT." into lmp-mr1-dev 
* commit 'b01a597924ab7afed689f7710c264684d1fac944':
  Separate VoLTE and VT configurations to enable devices/carriers to have VoLTE without VT.
 2014-10-23 22:02:59 +00:00
Etan Cohen
e41a9cf9f7 Separate VoLTE and VT configurations to enable devices/carriers to have VoLTE without VT. 
Change-Id: I233b003af57a550f2f51b12213700ab0451039e5
 2014-10-23 19:15:13 +00:00
Bryce Lee
fb9ac4c2d3 am 1d918403: am 477fa012: am 49cb52e2: Merge "resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev" into lmp-mr1-dev 
* commit '1d9184035d5d74c850d688cd269e97ea3f77953e':
  [Theater Mode] framework implementation through global setting
 2014-10-23 09:20:00 +00:00
Bryce Lee
1d9184035d am 477fa012: am 49cb52e2: Merge "resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev" into lmp-mr1-dev 
* commit '477fa012865c3c59ebc2dd834c53c7ee33fe3a95':
  [Theater Mode] framework implementation through global setting
 2014-10-23 08:01:57 +00:00
Bryce Lee
fb1cf36aa7 resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev 
Change-Id: I9e4cabd2d8a34a348ae888f096c8d3c35226e960
 2014-10-22 16:56:08 -07:00
Bryce Lee
584a445179 [Theater Mode] framework implementation through global setting 
Bug: 17684570
Change-Id: I64a9c9c0620049cdfcca0150648fa201281f7178
 2014-10-21 15:55:55 -07:00
Libin.Tang@motorola.com
0841572b99 am c2814749: am 4798bca2: am 0499bb5d: IMS:change enhanced 4g setting to store in setting db. 
* commit 'c28147490a0f7c5cceaaa4d0746ffa0d4842e8b6':
  IMS:change enhanced 4g setting to store in setting db.
 2014-10-16 00:06:30 +00:00
Libin.Tang@motorola.com
c28147490a am 4798bca2: am 0499bb5d: IMS:change enhanced 4g setting to store in setting db. 
* commit '4798bca2742a3e2ec7e13aa20a61fc447eadf29b':
  IMS:change enhanced 4g setting to store in setting db.
 2014-10-15 23:56:23 +00:00
Libin.Tang@motorola.com
0499bb5de4 IMS:change enhanced 4g setting to store in setting db. 
Change-Id: I2ec37478e2bef5b15b157e490f75d5dda5f97117
 2014-10-15 16:12:39 -07:00
Jim Miller
97f66f6754 am 26e4de2f: am 1a02efb1: am ce711c6d: am 09ba0da8: am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev 
* commit '26e4de2ff11c6e055a163fe20249e7f202629cb3':
  Add a checkbox option to 'require password to decrypt'
 2014-10-15 18:46:00 +00:00
Jim Miller
26e4de2ff1 am 1a02efb1: am ce711c6d: am 09ba0da8: am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev 
* commit '1a02efb1247569ae0e133c199295c873e4ad9b52':
  Add a checkbox option to 'require password to decrypt'
 2014-10-15 18:40:08 +00:00
Jim Miller
ce711c6d57 am 09ba0da8: am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev 
* commit '09ba0da87fa56eac91da5eb2d0a20b7799df66d5':
  Add a checkbox option to 'require password to decrypt'
 2014-10-15 18:31:32 +00:00
Jim Miller
09ba0da87f am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev 
* commit 'e7c325559d961f13c6df96803bca4747f41b27a4':
  Add a checkbox option to 'require password to decrypt'
 2014-10-15 18:26:59 +00:00
Jim Miller
6848dc8e3b Add a checkbox option to 'require password to decrypt' 
Fixes bug 17881324

Change-Id: Id94e593a172d686339c736473226fece1bb749ee
 2014-10-14 16:26:11 -07:00
Tom O'Neill
084cd5cdf4 am 2a30585a: am 58d0b623: am 1db0cce0: Merge "Fix a race where NLP consent dialog can be shown unnecessarily" into lmp-mr1-dev 
* commit '2a30585a4fa086089478d5068fbf354a8a967c19':
  Fix a race where NLP consent dialog can be shown unnecessarily
 2014-10-10 22:07:41 +00:00
Tom O'Neill
2a30585a4f am 58d0b623: am 1db0cce0: Merge "Fix a race where NLP consent dialog can be shown unnecessarily" into lmp-mr1-dev 
* commit '58d0b623f124c9bee3fe6aba33182c0ff6b1c28a':
  Fix a race where NLP consent dialog can be shown unnecessarily
 2014-10-10 17:16:23 +00:00
Dianne Hackborn
d95f1c991c am 75a6e82b: am 36ae48a8: am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '75a6e82bcc625025c5f48dc6c33d0dd469e9ca61':
  Put in real "code" (aka marketing) name.
 2014-10-10 05:41:19 +00:00
Dianne Hackborn
75a6e82bcc am 36ae48a8: am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '36ae48a850bade17d485cb49dd40a3f11f667ad4':
  Put in real "code" (aka marketing) name.
 2014-10-10 04:26:40 +00:00
Tom O'Neill
7731a99807 Fix a race where NLP consent dialog can be shown unnecessarily 
- Bug: 17908111

Change-Id: If94570861f38b922478d490599ab02cfb86adea6
 2014-10-09 11:30:49 -07:00
Dianne Hackborn
0761b1b5eb am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '89b196958fee07475765bd3c458098464ba16f2e':
  Put in real "code" (aka marketing) name.
 2014-10-09 00:14:54 +00:00
Dianne Hackborn
955d8d69ea Put in real "code" (aka marketing) name. 
Change-Id: Idb3976edfae37293ed75cb5b869b4b42d8042bbe
 2014-10-07 20:17:19 -07:00