10986 Commits

Author SHA1 Message Date
Wei Liu
c7d477bb7d Merge "Keep the BugreportWarningActivity screen on. Make the bugreport warning text scrollable." into lmp-sprout-dev 2014-10-07 22:56:59 +00:00
Wei Liu
751160397d Keep the BugreportWarningActivity screen on.
Make the bugreport warning text scrollable.

Bug: 16930717

Change-Id: I270ee3f3acdcdab2febc2a2768382bbfb20c438b
2014-10-07 15:39:09 -07:00
Jason Monk
000b85fa8c am 733bcc7f: Merge "Hide hotspot tile if \'provisioning\' is needed" into lmp-dev
* commit '733bcc7fbe8f03c92f20c57dd25cbc3b011cef9e':
  Hide hotspot tile if 'provisioning' is needed
2014-10-07 19:58:48 +00:00
Jorim Jaggi
c4a7c191be am 988a8a98: Merge "Update \'No notifications\' text on configuration change" into lmp-dev
* commit '988a8a9820bb3ae331be4932eb9e672a4614efd5':
  Update 'No notifications' text on configuration change
2014-10-07 19:58:28 +00:00
Jason Monk
733bcc7fbe Merge "Hide hotspot tile if 'provisioning' is needed" into lmp-dev 2014-10-07 18:53:20 +00:00
Jason Monk
20ef4024ed Hide hotspot tile if 'provisioning' is needed
If we need carrier entitlement checks don't show the hotspot tile
which could bypass them, instead make the user go to settings.

Bug: 17879554
Change-Id: I30a5b51b26a2d4e977579b71a16c3c7a8d004eea
2014-10-07 14:43:11 -04:00
Jorim Jaggi
988a8a9820 Merge "Update 'No notifications' text on configuration change" into lmp-dev 2014-10-07 17:48:01 +00:00
Amith Yamasani
b86671f4b8 am 41bb3455: Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev
* commit '41bb3455e44dc8fde4569bbfd56fa20c6da8a27d':
  Set the default user restrictions to disallow calling and sms
2014-10-07 17:33:25 +00:00
John Spurlock
2c52c443dc am 0d334365: Merge "Doze: Avoid pulsing in pockets." into lmp-dev
* commit '0d334365c6123388a0df81438b82122be29d19ab':
  Doze: Avoid pulsing in pockets.
2014-10-07 17:33:10 +00:00
PauloftheWest
f7b7b7585a am 53c84002: Merge "Fixed a Bluetooth Quick Settings update bug." into lmp-dev
* commit '53c84002911362c913bc72cd28d186718a33149d':
  Fixed a Bluetooth Quick Settings update bug.
2014-10-07 17:31:39 +00:00
Amith Yamasani
41bb3455e4 Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev 2014-10-07 17:11:34 +00:00
John Spurlock
92b8d41096 Doze: Avoid pulsing in pockets.
Query for the current proximity value before starting a pulse.
If a "near" value is returned, skip the entire pulse.

Bug: 17350239
Change-Id: Ib930d84b163c8e54b7be5d1c975e547692f8529f
2014-10-07 12:01:56 -04:00
PauloftheWest
53c8400291 Merge "Fixed a Bluetooth Quick Settings update bug." into lmp-dev 2014-10-07 13:01:28 +00:00
Amith Yamasani
aa6634eaca Set the default user restrictions to disallow calling and sms
When creating a user via the UI, disallow phone calls and SMS by
default. Primary user must explicitly enable it via Settings.

Bug: 17832802
Change-Id: I18cad4be8493ddc8890b5d90da2df256cb3f1ec9
2014-10-06 18:24:32 -07:00
Paul Jensen
69c489ed6f am 7627d2cd: Merge "Use network-specific HTTP proxy settings in captive portal login app." into lmp-dev
* commit '7627d2cd5cd93ebf8e683392edbef961dbc20d31':
  Use network-specific HTTP proxy settings in captive portal login app.
2014-10-06 23:52:12 +00:00
Geoff Mendal
1d593ad474 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-06 23:39:12 +00:00
Geoff Mendal
fc8d65197a Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-06 23:28:23 +00:00
Paul Jensen
7627d2cd5c Merge "Use network-specific HTTP proxy settings in captive portal login app." into lmp-dev 2014-10-06 23:01:27 +00:00
Wei Liu
a940f8656d Merge "Hide bug report notification in Android Framework from watches." into lmp-sprout-dev 2014-10-06 22:10:33 +00:00
Geoff Mendal
295c3cabb2 Import translations. DO NOT MERGE
Change-Id: I1b7537a5a607ad61da0b24e1826dc0876bb3f50d
Auto-generated-cl: translation import
2014-10-06 15:04:49 -07:00
Geoff Mendal
c6da9afdcc Import translations. DO NOT MERGE
Change-Id: Ib4bd44e7036f41df58740596f560091ef40c1f23
Auto-generated-cl: translation import
2014-10-06 14:55:42 -07:00
Wei Liu
e255e4e536 Hide bug report notification in Android Framework from watches.
Bug: 17806348
Change-Id: I1a90a9bc68d8ef4ff540dbbd9e4af4bfed8a61ae
2014-10-06 14:50:10 -07:00
Jorim Jaggi
8cc8dfed32 Update 'No notifications' text on configuration change
Bug: 17821946
Change-Id: Ia4518426ce059be5312d652bb27bbe11a1626518
2014-10-06 12:27:55 -07:00
Dianne Hackborn
90d557b7a6 am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev
* commit '7f7d240b13b96b617e298c6178af0425308f5ef9':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
2014-10-06 19:17:10 +00:00
Dianne Hackborn
7f7d240b13 Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 2014-10-06 18:48:34 +00:00
Geoff Mendal
c1a064dd94 Import translations. DO NOT MERGE
Change-Id: I391b269b0d535fa7d8a4082cb0271b0aeb16a497
Auto-generated-cl: translation import
2014-10-06 10:56:58 -07:00
Geoff Mendal
86dec04749 Import translations. DO NOT MERGE
Change-Id: I2100b649d1f2866cdc5ffd13f264afba347b6685
Auto-generated-cl: translation import
2014-10-06 10:54:01 -07:00
PauloftheWest
6cdeaa0d03 Fixed a Bluetooth Quick Settings update bug.
+ Now when a Bluetooth device disconnects, and the user is looking at quick
settings, the Bluetooth icon and text will update with the new state of
diconnected.

Bug: 17677593
Change-Id: Iccaf16a23f7e0b8690a32945906a9ccc2382cdd0
2014-10-06 09:31:48 -07:00
Baligh Uddin
6fe06067ff Import translations. DO NOT MERGE
Change-Id: I413d08f553c47701a72eb3481fe73a5ba80ba523
Auto-generated-cl: translation import
2014-10-04 14:34:27 -07:00
Baligh Uddin
58f23336a8 Import translations. DO NOT MERGE
Change-Id: Ied21f2af367832b5b11dc1ddc6f0927e47f1e113
Auto-generated-cl: translation import
2014-10-04 14:27:49 -07:00
Jorim Jaggi
3c6300da71 am eae1c3d5: Merge "Fix blank Keyguard #4" into lmp-dev
* commit 'eae1c3d5c1d7b292823c668eaedc72ffa707a5d6':
  Fix blank Keyguard #4
2014-10-04 00:04:22 +00:00
Jorim Jaggi
eae1c3d5c1 Merge "Fix blank Keyguard #4" into lmp-dev 2014-10-03 23:54:07 +00:00
Jorim Jaggi
a359df01e0 am f009e358: Merge "Fix blank lockscreen #3" into lmp-dev
* commit 'f009e3583f2843a463d75f06675ef18c398b0efd':
  Fix blank lockscreen #3
2014-10-03 23:53:09 +00:00
Dianne Hackborn
2d7576b082 Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
Keep around GET_TASKS as a permission available to apps, so apps still
think they have it and don't get all uppity because they don't.

Add a new REAL_GET_TASKS that is the actual permission now.

Plus some temporary compatibility code until everyone can transition
fromn GET_TASKS to REAL_GET_TASKS.

Change-Id: I12c1102eed24844685dcbd2fa3b612811603958f
2014-10-03 16:26:04 -07:00
Jorim Jaggi
5e08e6957d Fix blank Keyguard #4
When we were fading out the preview for phone/camera to crossfade to
the real application, it might have been that showKeyguard was
called in the middle of this transition. This change makes sure that
we cancel this animation when showing the keyguard.

Bug: 17439581
Change-Id: I89cacf7ecf43d37ea979418b976390272510a09d
2014-10-03 15:52:24 -07:00
Jorim Jaggi
f009e3583f Merge "Fix blank lockscreen #3" into lmp-dev 2014-10-03 22:33:06 +00:00
Jorim Jaggi
449981be16 Fix blank lockscreen #3
Bug: 17439581
Change-Id: Ic8cb7f32200b541ecc8fa36ad2517975cec0b545
2014-10-03 14:24:55 -07: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
Paul Jensen
88eb0fa8ee Use network-specific HTTP proxy settings in captive portal login app.
The HTTP proxy system properties are set based on the proxy configured
for the network the captive portal login app is operating on.  These
system properties are subsequently read by the WebView used to perform
the sign-in.
This is a short-term fix using reflection.  This allows users with
cellular providers that use proxies to sign into WiFi captive portals.
The long-term fix could involve:
1. Sending out a network-specific proxy config changed broadcast, and
2. Modifying the ActivityThread to set proxy system properties for
   Networks selected with setProcessDefaultNetwork(), and
3. Modifying WebView to read from the proxy system properties when
   PROXY_CHANGE_ACTION broadcasts are received.

bug:17679789
Change-Id: I3ada0470ad085df1a4452b4a655ac35f310d2241
2014-10-03 13:21:12 -04:00
John Spurlock
7da91cc21f am a79caa53: Merge "Update framework icons for media & alarm streams." into lmp-dev
* commit 'a79caa53405ea3efdd77d59ea7aa6dd64ecf09d3':
  Update framework icons for media & alarm streams.
2014-10-03 14:00:29 +00:00
John Spurlock
4bebb1dc5e Update framework icons for media & alarm streams.
Update resources to new style and remove obsolete items.

Bug: 17762712
Change-Id: Ibec121828084934cc066afe117f66b6a0eea603f
2014-10-02 20:11:37 -04: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
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
Erik Pasternak
4d82c46ef5 Merge "Implement auto-sleep functionality." into lmp-dev 2014-10-02 00:00:40 +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