Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
167,347 Commits 3 Branches 0 Tags
f1923c368c5c08a477b9f94dea6a499798d91d4f
Commit Graph

2071 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
Erik Pasternak
c7cbbe8e82 am d68362b9: am c6646b0c: am 739bf81d: am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev 
* commit 'd68362b962be2237418a1a10ebec7a2f75b9b267':
  Implement auto-sleep functionality.
 2014-10-02 13:38:16 +00:00
Hui Shu
0fdb165193 am 724fe35e: am 5f961157: am 888fd710: am 4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev 
* commit '724fe35eac0afd885f3a20ebf846f0429303c157':
  Revert "Remove WebView DRP Setting from Developer Settings"
 2014-10-02 12:40:59 +00:00
Hui Shu
30c284fc46 am 03e73745: am 7ce8d27f: am 9cd616e0: am aee5c9e7: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 
* commit '03e73745c69637efb806e174109410b0192536e7':
  Remove WebView DRP Setting from Developer Settings
 2014-10-02 12:38:15 +00:00
Erik Pasternak
739bf81dd1 am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev 
* commit '4d82c46ef5df06e1b92f3574e41b38a62ec0e607':
  Implement auto-sleep functionality.
 2014-10-02 00:04:01 +00:00
Hui Shu
888fd710cd am 4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev 
* commit '4e0ad44fcac48b2be77bd116ffdb696cb6490829':
  Revert "Remove WebView DRP Setting from Developer Settings"
 2014-10-01 22:15:20 +00:00
Jeff Brown
05af6adb8d Implement auto-sleep functionality. 
Added a new SLEEP_TIMEOUT setting which governs how long the device will
remain awake or dreaming without user activity.  By default this
value is set to -1 which maintains today's existing behavior.

We basically represent the time we are allowed to be dreaming as a new
kind of user activity summary state called DREAM, similar to BRIGHT
and DIM.  When the sleep timeout expires, the state is cleared and
the dream ends.

Bug: 17665809
Change-Id: I59aa7648dcec215f1285464fc1134934a09230e5
 2014-10-01 15:01:10 -07:00
Hui Shu
2267177279 Revert "Remove WebView DRP Setting from Developer Settings" 
This reverts commit eb487c6301.

Change-Id: Ie38a24efe2ea015b971cb0a05eca321299898538
 2014-10-01 21:41:07 +00:00
Hui Shu
9cd616e067 am aee5c9e7: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 
* commit 'aee5c9e7c1f61126c61722a957daedf57cf26e7e':
  Remove WebView DRP Setting from Developer Settings
 2014-10-01 18:35:49 +00:00
Hui Shu
eb487c6301 Remove WebView DRP Setting from Developer Settings 
BUG: 17730990
Change-Id: Ic4fde9affb2f887329d6b3d2dbe8945959c016d8
 2014-09-30 16:52:41 -07:00
Michael Wright
2e4c96f879 am 7d766833: am b5344ce5: am 57bb094b: am 233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev 
* commit '7d7668330efa99bdab44e8cc4d240ae0e05a0abb':
  Specify a device identifier for keyboard layout notification.
 2014-09-26 04:29:22 +00:00
Michael Wright
e27380ac46 am 233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev 
* commit '233bbabfe10bbf7190cdf3a6bb44f081a1fa91c7':
  Specify a device identifier for keyboard layout notification.
 2014-09-25 22:27:05 +00:00
Michael Wright
c93fbd1fae Specify a device identifier for keyboard layout notification. 
Bug: 17614683
Change-Id: If53489b09212bfa487d7dc3a7f9b000731d949ac
 2014-09-23 14:59:23 -07:00
Wink Saville
9bb67459b6 Merge commit 'edd57a98' into fix-conflict 
* commit 'edd57a98':

Conflicts:
	core/java/android/provider/CallLog.java
	telephony/java/android/telephony/TelephonyManager.java

Change-Id: Ia16537ede73f7b2e2c22ca1ff664a32bd6c272fa
 2014-09-16 13:23:43 -07:00
Tyler Gunn
6c8d6d74c0 resolved conflicts for merge of 66c16547 to lmp-sprout-dev 
Also fixed issue in TelephonyManager.

Change-Id: I4dde45e638c2bcf32f8f929d34d0083966f6761f
 2014-09-13 20:10:08 +00:00
Tyler Gunn
8bc3996189 am 21282583: am 66c16547: Merge "Renaming Telecomm to Telecom." into lmp-dev 
* commit '2128258322aa2f90d65c1963ede79d1bffb3fce4':
  Renaming Telecomm to Telecom.
 2014-09-13 18:03:04 +00:00
Tyler Gunn
ef9f6f957d Renaming Telecomm to Telecom. 
- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.

Bug: 17364651
Change-Id: I192cb5d189f55db012ea72ee82ccc5aedbc21638
 2014-09-12 22:16:17 -07:00
Julia Reynolds
3fb8348ecd am a098030f: am 086bf8e1: Merge "Allow device owners to update LOCATION_MODE." into lmp-dev 
* commit 'a098030f70a4861a4c0f7241d8a95f1d6441e5ed':
  Allow device owners to update LOCATION_MODE.
 2014-09-11 16:04:20 +00:00