Commit Graph

59447 Commits

Author SHA1 Message Date
Clara Bayarri
b3987bd7e9 Make ConfirmCredentials take user into account when creating intent
The existing implementation returned null if the device was not locked,
but when using ConfirmCredentials for the Work Profile we need to take into
account the user we want to confirm credentials for, given that the device
user might not have a lock but the work profile will.

Change-Id: Ifb5882846b0a62c73ac7cc04d90d1a4d9b103e63
2015-12-15 10:45:13 +00:00
Jun Mukai
81245161a0 Merge "Make public pointer icon API with custom icons." 2015-12-15 04:46:53 +00:00
Rob Carr
28ba383214 Merge "Move window replacement tracking to window state." 2015-12-15 04:05:19 +00:00
Jun Mukai
d4eaef7f4c Make public pointer icon API with custom icons.
BUG: 25778347, 23804184
Change-Id: If138b97c750c912e9848412c27b65004899961eb
2015-12-14 19:45:10 -08:00
Bryce Lee
5a0fed6841 Allow access to deprecated LOCK_PATTERN_ENABLED flag. am: 4614596a39 am: 36393a5674 am: 4ab8b0696a
am: 0510ad1bc9

* commit '0510ad1bc9a2da4fa84f1a5417a218dba48563e3':
  Allow access to deprecated LOCK_PATTERN_ENABLED flag.
2015-12-15 01:17:28 +00:00
Bryce Lee
0510ad1bc9 Allow access to deprecated LOCK_PATTERN_ENABLED flag. am: 4614596a39 am: 36393a5674
am: 4ab8b0696a

* commit '4ab8b0696a4383b7dec2fc2dc4f17596bcd9216a':
  Allow access to deprecated LOCK_PATTERN_ENABLED flag.
2015-12-15 00:11:06 +00:00
Wale Ogunwale
5144d154b5 Merge "Still save config on client side when not reporting to activity." 2015-12-15 00:06:02 +00:00
Bryce Lee
4ab8b0696a Allow access to deprecated LOCK_PATTERN_ENABLED flag. am: 4614596a39
am: 36393a5674

* commit '36393a5674bf50b351b5961a194ce2814ca00140':
  Allow access to deprecated LOCK_PATTERN_ENABLED flag.
2015-12-14 23:57:38 +00:00
Bryce Lee
36393a5674 Allow access to deprecated LOCK_PATTERN_ENABLED flag.
am: 4614596a39

* commit '4614596a395b6c86fff3f35a07edda2e848d743c':
  Allow access to deprecated LOCK_PATTERN_ENABLED flag.
2015-12-14 23:43:54 +00:00
Wale Ogunwale
14e811f5d9 Still save config on client side when not reporting to activity.
On the client side we have additional protection not to save new
configuration reported by activity manager if the app isn't handling
any of the configuration change that occurred. This is done because
the activity is expected to relaunch for any configuration it doesn't
handle. However, with multi-window support the activity manager doesn't
relaunch an activity if the configuration change doesn't cross a resource
threshold.
We now save the configuration on the client side when activity manager
tells us not to report the changes to the app (i.e. configuration
changed, but wasn't big enough for relaunch)

Bug: 23904868
Change-Id: I54f65cad65c1b8ed5da1165a8b2816adbea41d4b
2015-12-14 15:04:22 -08:00
Bryce Lee
4614596a39 Allow access to deprecated LOCK_PATTERN_ENABLED flag.
It is possible that older platforms may have not cleared the lock pattern,
but instead only checked this flag to determine the lock pattern enabled
state. In such cases, upgrading to a platform with that only checks the
lock pattern can lead to the lock screen being re-enabled by accident.
These new methods allow this condition to be identified and resolved.

Bug: 26029690
Change-Id: I8f7ebc0e1915049afe49c219c87010aa38a16244
2015-12-14 14:39:10 -08:00
Roozbeh Pournader
3cac67c074 Merge "Load Portuguese and German hyphenation in Hyphenator" 2015-12-14 21:54:26 +00:00
Greg Hackmann
40aa9f1b98 Merge "Trace SQLite operations" am: 6fe06606c4
am: 0f13ddfdff

* commit '0f13ddfdffacffe1c8bcce3adba87dd32b0ab92a':
  Trace SQLite operations
2015-12-14 13:49:02 -08:00
Greg Hackmann
0f13ddfdff Merge "Trace SQLite operations"
am: 6fe06606c4

* commit '6fe06606c4df39487d240cc1fa4ac6d944b33137':
  Trace SQLite operations
2015-12-14 13:37:30 -08:00
Jun Mukai
7767322565 Merge "Allow specifying pointer shape from xml resource." 2015-12-14 21:34:28 +00:00
Roozbeh Pournader
a1c0a82ba6 Load Portuguese and German hyphenation in Hyphenator
This also extends the fallback locale matching algorithm to consider
language+variant before just the language, so asking for "de-AT-1901"
would result in trying "de-1901" before trying "de".

Bug: 26169902
Change-Id: I55e5a73e7ac730d0bc14204126cbb3cc6ce0e9f1
2015-12-14 21:27:46 +00:00
Greg Hackmann
6fe06606c4 Merge "Trace SQLite operations" 2015-12-14 21:12:52 +00:00
Greg Hackmann
e12350faf7 Trace SQLite operations
Inefficient SQLite use can have non-obvious effects on performance.  For
example, insert and update operations can trigger a surprising number of
fsync() calls, especially if they're not grouped together into
transactions.

Add tracepoints around SQLite operations, to make it easier to pinpoint
their effects on the rest of the system.

Change-Id: I30cc3d02eca264e46dcc09ca7512a32519543834
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2015-12-14 12:32:26 -08:00
Jun Mukai
80fdc1bd36 Allow specifying pointer shape from xml resource.
Bug: 25777986
Change-Id: I8be5d2cb130299b0ea8f4f4d3dc582143f7ff553
2015-12-14 12:09:27 -08:00
Chad Brubaker
f58f540f7a Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2015-12-14 12:06:28 -08:00
Andreas Gampe
e37f2c6e11 Merge "Frameworks/base: Use Arrays.toString" 2015-12-14 20:05:27 +00:00
Chad Brubaker
827c3498eb Merge "Use the application\'s usesCleartextTraffic flag" am: d16f5f121e
am: a1c0bea895

* commit 'a1c0bea89518d020b615740215bff7fc4356e991':
  Use the application's usesCleartextTraffic flag
2015-12-14 12:05:20 -08:00
Andreas Gampe
e6748ce31f Frameworks/base: Use Arrays.toString
Fix a couple of cases where Arrays.toString should be used.

Bug: 19797138
Change-Id: I905fc79e63face9b26975320a92086c732bf6316
2015-12-14 12:04:26 -08:00
Chad Brubaker
4b4a252931 Merge "Check for null hostnames in RootTrustManager" am: 49ce7dc2ba
am: 15ea45c848

* commit '15ea45c848fbf9e70bbfe6afbfb25d39ce406c80':
  Check for null hostnames in RootTrustManager
2015-12-14 12:03:22 -08:00
Chad Brubaker
a1c0bea895 Merge "Use the application\'s usesCleartextTraffic flag"
am: d16f5f121e

* commit 'd16f5f121e560d9f18411cbdd3fa4fb48681c0c2':
  Use the application's usesCleartextTraffic flag
2015-12-14 11:57:29 -08:00
Chad Brubaker
15ea45c848 Merge "Check for null hostnames in RootTrustManager"
am: 49ce7dc2ba

* commit '49ce7dc2baa9ee867fc7b78301c65fab2168a9b2':
  Check for null hostnames in RootTrustManager
2015-12-14 11:55:05 -08:00
Chad Brubaker
d16f5f121e Merge "Use the application's usesCleartextTraffic flag" 2015-12-14 19:31:08 +00:00
Chad Brubaker
49ce7dc2ba Merge "Check for null hostnames in RootTrustManager" 2015-12-14 19:30:44 +00:00
Robert Carr
a1eb439eee Move window replacement tracking to window state.
In preparation for supporting replacement of child windows
we make replacement per window rather than per app.

Bug: 26070641

Change-Id: Ifa332086599c125611e430219c9497bae7e2ce31
2015-12-14 10:49:56 -08:00
Yohei Yukawa
c18a05faf1 Merge "Rotate IMEs (subtypes) by Meta+Space." 2015-12-14 18:39:19 +00:00
Steve McKay
3ab0c4c43e Merge "Load Home directory by default." 2015-12-14 18:18:02 +00:00
Steve McKay
b67bfbf975 Load Home directory by default.
Don't update toolbar before first root load.
This was causing Recents > Home flicker due
to Recents being the default root returned from getCurrentRoot.
Revert change causing regression in selection highlight.

Bug: 26093756
Change-Id: I2c555aa38d68e9bf7962b1407f9fc75c800216a6
2015-12-14 18:17:16 +00:00
Brad Ebinger
355f11034d Null pointer fix for StateMachine
Checks if StateMachine is null before calling callbacks.

Bug-Id: 26176787
Change-Id: I7ee92326e99e18a3b7045ccf098b52acfaff9a15
2015-12-14 09:02:38 -08:00
Andreas Gampe
51aeb69dd3 Merge "Frameworks/base: Fix Notification code" 2015-12-14 16:15:38 +00:00
Jason Monk
ded2b10520 Merge "Support dnd condition in Settings" 2015-12-14 15:39:55 +00:00
Gustav Sennton
88b3b57341 Merge "Add functionality for changing WebView provider." 2015-12-14 14:33:56 +00:00
Nicolas Geoffray
93444eb74f Merge "Special case system_server to not create the JIT code cache." 2015-12-14 13:04:06 +00:00
Jason Monk
a9927325ed Support dnd condition in Settings
- Add way to open QS detail panels directly
 - Add internal broadcast that can launch apps when dnd mode changes

Change-Id: If2b6350dc31623f3bf2f64c7eb141cff5d3d4e89
2015-12-13 16:22:37 -05:00
Jorim Jaggi
fe412b551b Merge "Add multi-window entry points logging" 2015-12-12 02:25:07 +00:00
Ian Pedowitz
19937f924e Merge "DO NOT MERGE Remove more extras during notification lightening." into mnc-dr1.5-dev am: cf07154e71
am: 911dfe8861

* commit '911dfe8861c7d67aab738cf42455837c8a9aefa7':
  DO NOT MERGE Remove more extras during notification lightening.
2015-12-11 17:18:51 -08:00
Ian Pedowitz
911dfe8861 Merge "DO NOT MERGE Remove more extras during notification lightening." into mnc-dr1.5-dev
am: cf07154e71

* commit 'cf07154e7102de304f1d887c8c2a2ef61b4880d7':
  DO NOT MERGE Remove more extras during notification lightening.
2015-12-11 17:12:35 -08:00
Ian Pedowitz
cf07154e71 Merge "DO NOT MERGE Remove more extras during notification lightening." into mnc-dr1.5-dev 2015-12-12 01:06:43 +00:00
Dan Sandler
ddb52fb1f5 DO NOT MERGE Remove more extras during notification lightening.
Basically anything Parcelable needs to go since it might be
quite large. Note that this includes additional extras such as
those contributed by WearableExtender.

Cherry-picked from 5012853de2

Bug: 26038546
Change-Id: I00eadd2b23dfc4fccf42332df658373bb05b8a45
2015-12-12 01:05:25 +00:00
Brad Ebinger
9a2b9f61a3 Merge "Add handler callbacks to StateMachine" 2015-12-12 01:01:39 +00:00
Andreas Gampe
1ed71f3722 Frameworks/base: Fix Notification code
Avoid a NullPointerException in NotificationListenerService when
a corrupt notification is found.

Fix not using the return of trim() in NotificationManagerService.

Bug: 19797138
Change-Id: I84dc15eba7b4052a774eb69d36591d100105f169
2015-12-11 15:49:07 -08:00
Jorim Jaggi
92de6b6381 Add multi-window entry points logging
Bug: 26116313
Change-Id: I159ca53857d382cb74ef8e49f7955946ccea93ca
2015-12-11 15:15:11 -08:00
Makoto Onuki
248808e3b2 Merge "Avoid using the term "current" to mean "calling"" 2015-12-11 22:51:31 +00:00
Makoto Onuki
32b3057e8a Avoid using the term "current" to mean "calling"
Bug 25715749

Change-Id: I98b28f1990d976c46b0eca2a2c15b7edbdda64ea
2015-12-11 14:34:13 -08:00
Julia Reynolds
41c264bae1 Merge "Add importance to notification guts." 2015-12-11 21:41:32 +00:00
Dimitry Ivanov
5747b3a85d Merge "Use nativeloader to load NativeActivity" 2015-12-11 21:38:29 +00:00