229894 Commits

Author SHA1 Message Date
John Reck
f6762aca4a Merge "Trap SIGABRT in RenderThread for unit tests" 2016-01-14 21:49:30 +00:00
Alan Viverette
c8ef3f8730 Don\'t verify the scrollbar drawable am: a53c3b2197
am: ca6b87fea6

* commit 'ca6b87fea6b16e38f8bbbd514d3cf07361a5feba':
  Don't verify the scrollbar drawable
2016-01-14 21:49:09 +00:00
Alan Viverette
ca6b87fea6 Don\'t verify the scrollbar drawable
am: a53c3b2197

* commit 'a53c3b2197b73d5b6a697ae2077e04065df84d9e':
  Don't verify the scrollbar drawable
2016-01-14 21:44:31 +00:00
John Reck
e5da4ef971 Trap SIGABRT in RenderThread for unit tests
Change-Id: Icc1039543d975497808a8062e9d909537c4a29c9
2016-01-14 13:43:55 -08:00
George Mount
1de0e6406a Merge "Fix crash in forceViewsToAppear" 2016-01-14 21:43:13 +00:00
John Reck
38e0c32852 Track texture memory globally
Also mostly consolidates texture creation

Change-Id: Ifea01303afda531dcec99b8fe2a0f64cf2f24420
2016-01-14 13:42:12 -08:00
George Mount
5fddd4ca58 Fix crash in forceViewsToAppear
Bug 26549234

Change-Id: I57cfc8ea8831d46a2846b36b2ac4acff2112b414
2016-01-14 13:40:18 -08:00
Dongwon Kang
8f31333fe8 Merge "MediaResourceMonitorService: Lift the condition for launching" 2016-01-14 21:14:54 +00:00
Victor Chang
dc0406d03e Add Directory.ENTERPRISE_FILE_URI
Add Directory.ENTERPRISE_FILE_URI to allow access
photo in work-side remote directory

BUG=25981851

Change-Id: I449e0ffcdf9acd6ee9a83d9067f58c41a3e75f02
2016-01-14 21:08:31 +00:00
Alan Viverette
a53c3b2197 Don't verify the scrollbar drawable
Avoids infinite invalidations caused by re-use of scrollbar drawable
during a single draw() pass. Does not address the general problem of
drawable reuse causing unnecessary invalidations as a result of calls
to setBounds() invoking invalidateSelf().

Bug: 26533725
Change-Id: I99e9c2dfe4ddfc833569e40e7268dcb03e931fc9
2016-01-14 21:07:13 +00:00
Philip P. Moltmann
c2ad22663b Clean up API for PrinterInfo.
- Make immutable
- Check parameters
- Check state while unparcelling

Change-Id: I13959845ca508936331488506380e894f49abf25
2016-01-14 12:48:31 -08:00
Wale Ogunwale
5d5127bf38 Merge "Fixed bug with wrong task bounds when device is rotated 180°" 2016-01-14 20:41:35 +00:00
Yohei Yukawa
e36c8078c4 Merge "Introduce SuggestionSpan#getLocaleObject()." 2016-01-14 20:36:53 +00:00
Yohei Yukawa
60fbc8e3bb Introduce SuggestionSpan#getLocaleObject().
This is a series of CLs to promote Java Locale object as a primary data
object to represent locale information in Android APIs.

With this CL, developers can get Locale information from SuggestionSpan
without semantically losing the original data.  Possible use cases would
be:
 - Emoji subtag (CLDR Ticket #9063)
 - Stable and reliable 3-letter country codes handling
 - Custom attributes based on private extensions.

Note that this CL does not change the current behavior of
SuggestionSpan#getLocale() as is, even if it is created with a malformed
Locale object:

  new SuggestionSpan(new Locale(" a ", " b c ", " e"), new String[0], 0)
          .getLocale() -> " a  b c  e".

Bug: 22858221
Change-Id: I96dfd4f819a236ee2e6dbd3e12903d1214223cb0
2016-01-14 12:16:06 -08:00
Amit Mahajan
0c0814839f Adding new intent for EMERGENCY_CALL_STATE_CHANGE
Bug: 24147407
Change-Id: Ida957b9cc6b9c3e13bc8660213ce5cf979c886d5
2016-01-14 11:42:31 -08:00
Makoto Onuki
1abb57b06e Remove the index columns from the blocked provider.
Bug 26232372

Change-Id: Ic72d4b7cee2158ad544b4375a382597c110debf6
2016-01-14 11:39:33 -08:00
Etan Cohen
20d329b08d NAN: baseline NAN manager for discovery.
Initial framework for user API (all @hide for now). Supports:
- NAN configuration
- Publish/Subscribe = Discovery
- Message passing
- Notifications

Bug: 26216681
Change-Id: I72e467756a02f7b80c52fae916b9a47c8174af42
2016-01-14 11:34:07 -08:00
Derek Sollenberger
3d5278b638 Update TestWindowContext to work with new HWUI ops.
This enables HWUI to be testing within Skia's infrastructure and
fixes skia bug 4775.

Change-Id: I242b9e4c5ed0f4523b6075d8825a2624235a01c7
2016-01-14 19:26:04 +00:00
Chris Tate
16548a3ef8 Merge "Don't full-data back up apps in foreground-equivalent state" 2016-01-14 19:15:42 +00:00
Alan Viverette
0960010242 Merge "Clarify interaction between setPivot() and setPivotRelative()" 2016-01-14 19:10:21 +00:00
Shreyas Basarge
5db09084c8 Added priority to JobScheduler scheduling
Priority can be assigned to jobs. Higher priority
jobs can preempt lower priority ones. Reason for
calling onStopJob (timeout, preempt, etc.) is set
on the JobParameters object.

Reference:
https://docs.google.com/document/d/1fuVO5rBCkODx8wjk6uulFCP1Uzfx7IVsw2EyKKrGqVA

Change-Id: Ic36016514cec076984d44086316d8d00d896b3aa
2016-01-14 19:09:03 +00:00
Christopher Tate
63fec3ef1a Don't full-data back up apps in foreground-equivalent state
We have to kill the app and bring it up in a controlled lifecycle mode
in order to do full-data backup, and if it's e.g. playing media, this
is hugely disruptive.  Instead, we now check whether an app being
considered for full-data backup is in a user-observable state, and
defer its backup if so.  We don't kick it all the way down the
daily-backup cycle in this situation -- we set it up to retry the
backup in just a few hours.

Bug 25960428

Change-Id: I576f25c6fb07545565f59bd685624c612b9c5ffd
2016-01-14 11:03:36 -08:00
Chris Craik
6fb775521a Merge "Log render pipeline in gfxinfo dump" 2016-01-14 18:58:54 +00:00
Fyodor Kupolov
4ae95e5ab9 Merge "Explicitly pass userId to getWindowToken" 2016-01-14 18:37:18 +00:00
Chris Craik
ff3edce12d Log render pipeline in gfxinfo dump
Change-Id: Ia50c445b29d918f274ec45632d61d8b8479c72eb
2016-01-14 10:29:38 -08:00
Alan Viverette
253331c051 Clarify interaction between setPivot() and setPivotRelative()
Change-Id: I108df5170f702b4938b4fe7fa35ed42d4a8a2d5d
2016-01-14 13:18:39 -05:00
Dongwon Kang
57c54f25d8 MediaResourceMonitorService: Lift the condition for launching
Bug:26548364
Change-Id: If10a8b1c4b2dcdcdab16c9dcc899d37af1224505
2016-01-14 10:11:43 -08:00
Xiyuan Xia
1b30f79cff Refactoring for better extendability
- Exposing members of PhoneStatusBar, StatusBarKeyguardViewManager and
  KeyguardBouncer to sub class;
- Add a configuable SystemUIFactory as class factory for components;
- Add logoutCurrentUser and switchToByUserId to UserSwitcherController;

BUG:22407003
Change-Id: I3902baf3c721d89217b27a6310c4202a198cb209
2016-01-14 09:47:57 -08:00
Bartosz Fabianowski
f9bf6da6cd Add WifiConfiguration.shared flag
am: 6fb0756d2f

* commit '6fb0756d2f59d70507919350f6192718b5d3f630':
  Add WifiConfiguration.shared flag
2016-01-14 17:24:52 +00:00
Ben Kwa
e2610c4148 Merge "Swap in the correct home icon." 2016-01-14 17:19:36 +00:00
Wale Ogunwale
e1fe4d1e12 Fixed bug with wrong task bounds when device is rotated 180°
When the device rotation changes we were rotating the task bounds
for tasks whose bounds shouldn't change independently from its
stack. This can cause the task and it windows to not show on screen
since they can end up outside the stack crop.
We now let the stack take care of the rotation for tasks that shouldn't
be resized independently of their stack.

Bug: 25970565
Change-Id: I82b78fbe233b57a4fd5df967f109eb532e0579d5
2016-01-14 09:03:32 -08:00
Sudheer Shanka
659133c77b Merge "Made changes to padlock support for preferences." 2016-01-14 16:38:35 +00:00
Sudheer Shanka
ea088af5c1 Made changes to padlock support for preferences.
- Currently, if a preference is disabled by admin, we add a padlock and disable
the preference. And now if the preference is enabled in some other place, the
padlock is not removed. Updated RestrictedPreference to fix this
behavior.
- Made RestrictedPreferenceHelper and
RestrictedPreferenceHelper.onAttachedToHierarchy public so that preferences in
Settings can use these.
- Put a check for null to avoid NullPointerException.
- Removed a redundant statement.

Change-Id: Ie88a761dc38c58a680c62b3703d2081c67462079
2016-01-14 16:25:56 +00:00
Shreyas Basarge
7aa4671b36 DO NOT MERGE Fix for syncs being dropped when appIdle is on
Syncs were being dropped when appIdleMode was on for
an app. This CL backs off the sync instead of dropping
it. When the app becomes non-idle, backoff is cleared
and the sync is performed.

Bug: 26355386
Change-Id: I2040dfd847011d3ca902e66a8cd52b2a429177c1
2016-01-14 16:24:00 +00:00
George Mount
0f5fd2d870 Merge "Add IntDefs for Animator and Transition classes." 2016-01-14 16:21:27 +00:00
Ben Kwa
33a610dea7 Swap in the correct home icon.
BUG=25793423

Change-Id: I55ef5fbc6d6c1497ef4b761f3af236ba5e7e6bbe
2016-01-14 08:21:05 -08:00
Bartosz Fabianowski
6fb0756d2f Add WifiConfiguration.shared flag
* Add boolean WifiConfiguration.shared, which indicates whether a network
  is shared (visible to and usable by all users) or private (visible to
  and usable only by the user who created it)
* Extend WifiConfiguration.configKey(...) so that when two users create
  private configurations for the same network, their configurationKeys
  will be different.
* Make AccessPoint.matches(...) take into account the shared flag

BUG=25600871

Change-Id: I4a4335fa3b4b4f850e16748583a29ab66992ddc8
2016-01-14 17:18:45 +01:00
Alan Viverette
388eb91c12 Merge "Clean up CalendarView docs and annotations" 2016-01-14 16:17:26 +00:00
Alan Viverette
dbea715a1f Merge "Clean up night mode documentation" 2016-01-14 16:16:30 +00:00
Alan Viverette
4bf96caa84 Merge "Apply menu callbacks to existing Toolbar menu view" 2016-01-14 16:16:00 +00:00
Julia Reynolds
0ae2b0b47d Verify zen rule owners before persisting rules.
Change-Id: Ib89a17aa9d460db268b207828aa23c7802cfd7e9
2016-01-14 11:15:57 -05:00
Sudheer Shanka
f8f858e4ea Merge "Add restricted padlocks to tiles in quick settings." 2016-01-14 16:11:12 +00:00
Shreyas Basarge
768464c6c3 Merge "Fix for syncs being dropped when appIdle is on" 2016-01-14 15:54:41 +00:00
Marco Nelissen
61becc4592 Merge "Fix race condition when setting default ringtones" 2016-01-14 15:42:42 +00:00
Robin Lee
b68d2d5b68 Merge "Always-on app VPNs" 2016-01-14 11:37:18 +00:00
Marco Nelissen
68528911b9 Fix race condition when setting default ringtones
If the device was powered off during first boot, after media scanner
inserted some entries but before the default ringtone settings were
set (or committed to disk), the default settings would not be set
on subsequent boots.

Bug: 18625739
Bug: 22349910
Bug: 25633323
Change-Id: I8ff5d3c4f842297d0675e1f5cbe17c0709a14158
2016-01-14 00:59:38 -08:00
Justin Harrison
051782fd2d Merge "Fix race condition when setting default ringtones" into mnc-dr1.5-dev am: e41a6c8b19 am: 2363da89a4
am: 5cb336586e  -s ours

* commit '5cb336586e55e6add5aec1d87ee8848657d9051d':
  Fix race condition when setting default ringtones
2016-01-14 08:43:45 +00:00
Amit Mahajan
e3e79ff8c9 Merge "Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]" into mnc-dr1.5-dev am: c6c9b2aa66 am: cd097ff856
am: 2bb7707e00  -s ours

* commit '2bb7707e00922d2f614b8d92bdf3e62dfa6fd80d':
  Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]
2016-01-14 08:09:30 +00:00
Amit Mahajan
77799d5dba Merge "DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into mnc-dr1.5-dev am: 658fdf8426 am: 2b260b0006
am: fa86813a56  -s ours

* commit 'fa86813a56cf631b4609387e8ef5ed9e82b47eac':
  DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE
2016-01-14 08:07:45 +00:00
Daichi Hirono
537427bdda Merge "Add a test for createDocument and getPartialObject." 2016-01-14 07:46:43 +00:00