drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
168,518 Commits 1 Branch 0 Tags
Commit Graph

500 Commits

Author SHA1 Message Date
Jeff Sharkey
670cf5c663 am 22c3f906: am 628d2606: Merge "Move ringtone redirection to MediaPlayer." into lmp-mr1-dev 
* commit '22c3f90639fa8d74de68a63b0a13412740580845':
  Move ringtone redirection to MediaPlayer.
 2014-11-14 00:02:58 +00:00
Jeff Sharkey
22c3f90639 am 628d2606: Merge "Move ringtone redirection to MediaPlayer." into lmp-mr1-dev 
* commit '628d2606f757da7b6734c7cd438535069f77b065':
  Move ringtone redirection to MediaPlayer.
 2014-11-13 23:50:16 +00:00
Jeff Sharkey
3b566b8470 Move ringtone redirection to MediaPlayer. 
Way back in API 1 we defined Settings.System.DEFAULT_NOTIFICATION_URI
which redirects through SettingsProvider before finally ariving at
the real underlying ContentProvider, usually MediaStore.

With new SELinux rules, we're no longer allowing the system_server
to hold open FDs to shared storage devices, which causes these
proxied openFile() calls to fail.

To work around this, teach MediaPlayer to resolve the final ringtone
Uri without going through the system.

Bug: 18226181
Change-Id: I40c68617c952c0bb3e939e5084f5b68a35e31ae3
 2014-11-13 13:52:41 -08: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
5716ebe50d Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev 
automerge: 2eb5a5f

* commit '2eb5a5f727d4692b70b68cb4b1b7e31bf74f13a4':
  Add HIDE_CARRIER_NETWORK_SETTINGS global setting.
 2014-11-12 01:14:00 +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
John Spurlock
41cf924137 am 1e64aa33: Merge "Reset rotation-lock-for-accessibility setting on upgrade." into lmp-mr1-dev automerge: e586ab7 
* commit '1e64aa3382f6d25a6ac2231f861c25ecca328285':
  Reset rotation-lock-for-accessibility setting on upgrade.
 2014-11-07 21:14:13 +00:00
John Spurlock
1e64aa3382 Merge "Reset rotation-lock-for-accessibility setting on upgrade." into lmp-mr1-dev 
automerge: e586ab7

* commit 'e586ab79670b6fabfa80f1f29ecb184f97f06f72':
  Reset rotation-lock-for-accessibility setting on upgrade.
 2014-11-07 20:55:24 +00:00
John Spurlock
8c51d0b711 Reset rotation-lock-for-accessibility setting on upgrade. 
Since it now hides the display setting, force the user to opt-in
again.

Bug: 18104538
Change-Id: I4cac947f7a35ba0f578d059542401dcc5d169307
 2014-11-07 15:14:21 -05: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
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
5c69f5b276 am 2e647efe: Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev 
* commit '2e647efe01dcdb82d2d7f8a23540ba6b690a95d6':
  Move LOCK_TO_APP_EXIT_LOCKED from System to Secure
 2014-11-03 14:41:07 +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
Eric Laurent
4ec1d430db am 670a82cb: Merge "audioservice: fix default stream volume" into lmp-mr1-dev 
automerge: af93061

* commit 'af9306149323120d8098f5fdef15b923e36d9569':
  audioservice: fix default stream volume
 2014-10-27 21:32:52 +00:00
Eric Laurent
af93061493 am 670a82cb: Merge "audioservice: fix default stream volume" into lmp-mr1-dev 
* commit '670a82cbb1b62e69fa7ef7387eed545a76c96f76':
  audioservice: fix default stream volume
 2014-10-27 20:36:54 +00:00
Eric Laurent
91377de6f2 audioservice: fix default stream volume 
When the max stream volume is configurable by
a system property, the default stream volume should
be set accordingly.

Bug: 17507571.

Change-Id: I9d9378292fc7b9c9e32acc55a275cc0ae5b203d4
 2014-10-27 10:13:00 -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
Pavel Zhamaitsiak
b01a597924 am c8a09d54: Merge "Separate VoLTE and VT configurations to enable devices/carriers to have VoLTE without VT." into lmp-mr1-dev 
* commit 'c8a09d543429e1a937a13e2173c96255579495f7':
  Separate VoLTE and VT configurations to enable devices/carriers to have VoLTE without VT.
 2014-10-23 20:35:43 +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
477fa01286 am 49cb52e2: Merge "resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev" into lmp-mr1-dev 
* commit '49cb52e296c48613c2177bfcb14fc67e21b9ae03':
  [Theater Mode] framework implementation through global setting
 2014-10-23 07:55:21 +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
Christopher Tate
2203e532d6 am 04e6827a: Fix settings db update sequence 
automerge: 281763b

* commit '281763ba1b4a6255799046f78930b586cd7e541c':
  Fix settings db update sequence
 2014-10-22 18:44:40 +00:00
Christopher Tate
281763ba1b am 04e6827a: Fix settings db update sequence 
* commit '04e6827ace936e0cbb666d8ef94635b73672aa41':
  Fix settings db update sequence
 2014-10-22 18:06:09 +00:00
Christopher Tate
04e6827ace Fix settings db update sequence 
The 'global' table only exists in the owner-user db instance; make
sure to apply global-setting update steps only when bringing up that
instance.

Bug 18069830

Change-Id: I843eabe710d9487de94690921d61adb181b45ed2
 2014-10-22 10:36:42 -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
Geoff Mendal
e8d005429c Import translations. DO NOT MERGE 
Change-Id: Idcc94d2f5b04a7eea17b530c4a8ff7f8b76fff38
Auto-generated-cl: translation import
 2014-10-20 16:21:14 -07:00
Geoff Mendal
cc29c5ef82 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-16 00:21:26 +00:00
Geoff Mendal
5e14dc8426 Import translations. DO NOT MERGE 
Change-Id: I1232fd67bffa5401e778116a418bbc20902f2723
Auto-generated-cl: translation import
 2014-10-15 17:16:40 -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
Dianne Hackborn
2fc4d81113 am d6bcda99: am 02b4caf5: am 02d758a9: am 7caa51e6: Merge "Fix issue #17811029: Settings provider race when removing users" into lmp-dev 
* commit 'd6bcda99b062eb0bb8511d7a4a1cefc23df3cb77':
  Fix issue #17811029: Settings provider race when removing users
 2014-10-03 21:52:42 +00:00
Dianne Hackborn
02d758a9e8 am 7caa51e6: Merge "Fix issue #17811029: Settings provider race when removing users" into lmp-dev 
* commit '7caa51e6ec6443d5c1fdb96f7e42508b074b4278':
  Fix issue #17811029: Settings provider race when removing users
 2014-10-03 21:02:42 +00:00
Dianne Hackborn
67f175cf07 Fix issue #17811029: Settings provider race when removing users 
Change-Id: Ia40d0a9c161b765d1340db5390d0acdbfc050b81
 2014-10-03 12:29:43 -07:00
Kenny Guy
2483cf54ac am 88b01d88: am 27cee100: am bdcfc01b: am 3de09018: Merge "SettingsProvider should use correct cache when redirecting to user 0." into lmp-dev 
* commit '88b01d88a2f343256a426280297e9587bfebff87':
  SettingsProvider should use correct cache when redirecting to user 0.
 2014-10-02 19:43:45 +00:00
Kenny Guy
bdcfc01b3b am 3de09018: Merge "SettingsProvider should use correct cache when redirecting to user 0." into lmp-dev 
* commit '3de09018a9611b1791cc29ed5200b7d9694189a9':
  SettingsProvider should use correct cache when redirecting to user 0.
 2014-10-02 16:55:35 +00:00
Kenny Guy
3de09018a9 Merge "SettingsProvider should use correct cache when redirecting to user 0." into lmp-dev 2014-10-02 16:48:57 +00:00
Dianne Hackborn
7cf6cac507 am 03e173ed: am ded96310: am 796d6ece: am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '03e173edce42a5ae0de8a7718330d83664a84a9e':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-02 13:38:23 +00: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
Dianne Hackborn
796d6eced1 am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit 'c338784bf6bfcce3cd7db40f46b0e6c815e9ed3a':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-02 00:27:48 +00:00
Dianne Hackborn
c338784bf6 Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 2014-10-02 00:23:18 +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
Dianne Hackborn
8d05172112 More work on issue #17656716: Unhandled exception in Window Manager 
Fix Slog.wtf to not acquire the activity manager lock in its code
path, so that it can never deadlock.  This was the original intention
of it, but part was missed.

Now we can put back in the code to detect when strict mode data is
getting large (a little more targeted now to the actual problem),
and use Slog.wtf to report it.  And as a bonus, when this happens
we will now clear all of the collected violations, to avoid getting
in to the bad case where IPCs start failing.  So this should be
good enough for L to fix the problem, with wtf reports for us to
see if the underlying issue is still happening.

Finally, switch a butch of stuff in the system process from Log.wtf
to Slog.wtf, since many of those are deadlocks waiting to happen.

Oh and fix a crash in the settings provider I noticed in APR.

Change-Id: I307d51b7a4db238fd1e5fe2f3f9bf1b9c6f1c041
 2014-10-01 16:58:56 -07: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
Kenny Guy
a37d000c2b SettingsProvider should use correct cache when redirecting to user 0. 
SettingsProvider reads secure and system settings for managed
profiles from user 0 instead. However it still checks the cache
for the managed profile not user 0.

Bug: 17736586
Change-Id: I15d44b8a5779b01e6b9032e528dc34f5c5602449
 2014-10-01 19:18:18 +01:00
Amith Yamasani
6ea243e87e am bc1ec524: am 57924e40: am de208628: am eb5fb023: Merge "Return masked location mode for managed profiles" into lmp-dev 
* commit 'bc1ec524ec5b91864547fb06af2132145b296c0a':
  Return masked location mode for managed profiles
 2014-09-24 22:54:33 +00:00
Amith Yamasani
b1920e2d1c am eb5fb023: Merge "Return masked location mode for managed profiles" into lmp-dev 
* commit 'eb5fb0236f3ed0c8068d5e65f2396047ae69f78b':
  Return masked location mode for managed profiles
 2014-09-24 21:34:44 +00:00
Amith Yamasani
ccc7cb9bdb Return masked location mode for managed profiles 
If there's a user restriction on location sharing in a
managed profile, always return empty string for location
providers so that location can be disabled by the admin
even if the primary user has location enabled.

Also fix an incorrect update of the cache. Shouldn't update
the primary user's cache when the caller is the managed profile.

Bug: 17478855
Change-Id: Icab3459ae351c5cfc287e21df6a5ba1df9dfbdb4
 2014-09-24 12:11:04 -07:00
Baligh Uddin
f0e65a3298 Import translations. DO NOT MERGE 
Change-Id: I4e30e9bfaa1032d9e2cd8ca170945b4c4f16d597
Auto-generated-cl: translation import
 2014-09-20 23:13:04 -07:00
Baligh Uddin
b1b8fa00de Import translations. DO NOT MERGE 
Change-Id: If5c2ca9461d0d7846374fda66e3d091dfa8f05e7
Auto-generated-cl: translation import
 2014-09-20 23:10:32 -07:00