Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
216,795 Commits 3 Branches 0 Tags
26637cb3fd56c73d51d7cf53a4e97a51847dfc4f
Commit Graph

57436 Commits

Author SHA1 Message Date
Nick Kralevich
26637cb3fd am 1293b953: am 712205ba: am 9d586927: Merge "Automatically assign default seinfo labels using the string "default"." 
* commit '1293b953c4c82dfc8738ba1dfc48f7739df78c69':
  Automatically assign default seinfo labels using the string "default".
 2015-09-01 17:06:15 +00:00
Nick Kralevich
1293b953c4 am 712205ba: am 9d586927: Merge "Automatically assign default seinfo labels using the string "default"." 
* commit '712205bac075dc59a1ccd79a860d553ba31402f0':
  Automatically assign default seinfo labels using the string "default".
 2015-09-01 16:51:19 +00:00
Nick Kralevich
712205bac0 am 9d586927: Merge "Automatically assign default seinfo labels using the string "default"." 
* commit '9d586927102b597845607ccc82661e350821de82':
  Automatically assign default seinfo labels using the string "default".
 2015-09-01 16:37:59 +00:00
Jorim Jaggi
6a89feae87 am 53c5dadb: am d302508d: am 4a306fd7: am 3a464785: Add a private API to get notified about lockout resets 
* commit '53c5dadbb8ddf0898e91e129aee4a19f1028175a':
  Add a private API to get notified about lockout resets
 2015-09-01 16:10:10 +00:00
Todd Kennedy
fa1ff3da12 am dde3fd65: am f7bf24ad: am 9fe274d6: am 9e25e164: am e7078e18: Merge "Ensure host is set before onInflate()" into mnc-dev 
* commit 'dde3fd6585411bd31ff7717eff483f5b7534c0c9':
  Ensure host is set before onInflate()
 2015-09-01 16:09:50 +00:00
Adrian Roos
e6da9bb7c6 am e803c9ed: am 9cb060d0: am 7e1775d2: am 78195312: Merge "Disable fingerprint after force lock" into mnc-dr-dev 
* commit 'e803c9ed7f1ae5f31f041e7c6ce14d91965b7ada':
  Disable fingerprint after force lock
 2015-09-01 16:08:26 +00:00
Adam Lesinski
54c070ef14 am f7ce28fa: am d0ce1fbb: am 69e17f59: am da43a3aa: Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev 
* commit 'f7ce28fad5d76267a9e69a05f6a2147c6baae827':
  BatteryStats: Start using cpu power from kernel
 2015-09-01 16:07:56 +00:00
Filip Gruszczynski
ac6b74a4dc Merge "Move Configuration creation from Window Manager to Activity Manager." 2015-09-01 15:41:17 +00:00
Alan Viverette
0bff3df090 Merge "Make AbsActionBarView eat touch/hover events" 2015-09-01 15:32:41 +00:00
Filip Gruszczynski
ebcc875f10 Move Configuration creation from Window Manager to Activity Manager. 
Currently the construction of configuration is split between thease
two entities. This poses two problems: it's harder to follow the
construction logic and more importantly we can't determine if
configuration changes significantly before delegating work to the
Window Manager. This CL moves the configuration override logic to
the Activity Manager, since it both detects configuration changes and
informs clients about them. Window Manager becomes purely a recipient
of the information.

Change-Id: I075570ee055cce9c5665772fa8d4fe8ccb5c6313
 2015-09-01 08:14:51 -07:00
Robert Craig
5e16bc5a14 Automatically assign default seinfo labels using the string "default". 
default seinfo values are those for which policy lacks a
matching stanza in the corresponding mac_permissions.xml
file. Prior to this change the null object reference was
used to represent the non-matching state. This is in
contrast to a policy supplied default stanza which will
assign a non null seinfo value. Confused yet?

Basically, two default states were distinguished in the
code to describe the two cases where either a policy stanza
spelled out the base case seinfo label or not. Policy
writers could either supply a default stanza or rely on
the class instantiated value assigned by the ApplicationInfo
object. The hope was that the later assignment could be
used to help distinguish the cases where policy writers
intentionally white listed apps. This change will just use
the hard coded "default" string implicitly to describe all
cases and removes the idea of a policy supplied default stanza.

Change-Id: Ib7b01ee004775f24db9a69340a31784b967ce030
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
 2015-09-01 05:51:04 -04:00
Jorim Jaggi
53c5dadbb8 am d302508d: am 4a306fd7: am 3a464785: Add a private API to get notified about lockout resets 
* commit 'd302508d2838000b1dde05d9bfaf5e5181dcf9dc':
  Add a private API to get notified about lockout resets
 2015-09-01 01:05:39 +00:00
Jorim Jaggi
4a306fd744 am 3a464785: Add a private API to get notified about lockout resets 
* commit '3a464785088e7fd206666f640912729533948ce8':
  Add a private API to get notified about lockout resets
 2015-09-01 00:47:00 +00:00
Jorim Jaggi
3a46478508 Add a private API to get notified about lockout resets 
SystemUI uses it to start authentication again after lockout reset
expired.

Bug: 22846755
Change-Id: I90a987c6aa4ac52cc7e7aff1bce262d1db3f12ee
 2015-09-01 00:37:54 +00:00
Doris Liu
85c0786e69 Merge "Correct isRunning() behavior for AnimatorSet" 2015-08-31 23:57:17 +00:00
Todd Kennedy
dde3fd6585 am f7bf24ad: am 9fe274d6: am 9e25e164: am e7078e18: Merge "Ensure host is set before onInflate()" into mnc-dev 
* commit 'f7bf24ad1d780b326287409f37e0e8c03115f60d':
  Ensure host is set before onInflate()
 2015-08-31 23:14:54 +00:00
Todd Kennedy
9fe274d638 am 9e25e164: am e7078e18: Merge "Ensure host is set before onInflate()" into mnc-dev 
* commit '9e25e1645f5e436c88ceab7d7eaf9f21c7fa845b':
  Ensure host is set before onInflate()
 2015-08-31 22:57:52 +00:00
Todd Kennedy
9e25e1645f am e7078e18: Merge "Ensure host is set before onInflate()" into mnc-dev 
* commit 'e7078e181cd00d20ce7764efa9835e2604a3cb83':
  Ensure host is set before onInflate()
 2015-08-31 22:45:23 +00:00
Todd Kennedy
0aa69b7dc5 Ensure host is set before onInflate() 
Bug: 22512520
Change-Id: I70f3b3c3234d7015880e0b83ae13f6fbe218f19a
 2015-08-31 14:10:04 -07:00
Adrian Roos
e803c9ed7f am 9cb060d0: am 7e1775d2: am 78195312: Merge "Disable fingerprint after force lock" into mnc-dr-dev 
* commit '9cb060d0c314630f6af89677263233f3253ad847':
  Disable fingerprint after force lock
 2015-08-31 20:40:54 +00:00
Adrian Roos
7e1775d246 am 78195312: Merge "Disable fingerprint after force lock" into mnc-dr-dev 
* commit '781953123e5b0f0f85691eabc13b3430c3054a10':
  Disable fingerprint after force lock
 2015-08-31 20:16:57 +00:00
Adrian Roos
781953123e Merge "Disable fingerprint after force lock" into mnc-dr-dev 2015-08-31 20:04:46 +00:00
Adam Lesinski
f7ce28fad5 am d0ce1fbb: am 69e17f59: am da43a3aa: Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev 
* commit 'd0ce1fbbba497e9b5082c69d8da7260e85b0b579':
  BatteryStats: Start using cpu power from kernel
 2015-08-31 19:33:24 +00:00
Adam Lesinski
69e17f59f8 am da43a3aa: Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev 
* commit 'da43a3aacaba069e79f1dbfa491f6bc0b6f7fa95':
  BatteryStats: Start using cpu power from kernel
 2015-08-31 19:13:39 +00:00
Alan Viverette
82d31d456e Make AbsActionBarView eat touch/hover events 
This code is taken straight out of Toolbar.

Bug: 22709057
Change-Id: I54ef6af8436454718009186afed79f3a003ac271
 2015-08-31 15:13:05 -04:00
Adam Lesinski
da43a3aaca Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev 2015-08-31 19:04:46 +00:00
Alan Viverette
c725e8d5ea Add missing @param in ResourceManager, set InflateException source 
Bug: 11695070
Change-Id: I94a4980688a952c1f59f1cb15cf2192e3c51de90
 2015-08-31 11:36:16 -04:00
Adrian Roos
0cb50efdc2 Disable fingerprint after force lock 
Bug: 23275072
Change-Id: Icaeffaa1fa22a4a800ddf0f38105099557c74317
 2015-08-28 23:54:43 +00:00
Robert Greenwalt
06eeda6b38 am 8096be27: am fbb28f55: am 77d02900: am 5799f428: am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev 
* commit '8096be27323b26ae177255381366823c8448e3c5':
  Reduce CONNECTIVITY_CHANGE bcasts
 2015-08-28 22:16:02 +00:00
Robert Greenwalt
8096be2732 am fbb28f55: am 77d02900: am 5799f428: am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev 
* commit 'fbb28f5552fe42453ebaf48fc11a7c07a5c9bd8b':
  Reduce CONNECTIVITY_CHANGE bcasts
 2015-08-28 22:05:38 +00:00
Robert Greenwalt
77d02900d8 am 5799f428: am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev 
* commit '5799f428063cec8f0b85cdff41185e0725b19b74':
  Reduce CONNECTIVITY_CHANGE bcasts
 2015-08-28 21:47:20 +00:00
Fyodor Kupolov
3f1099b062 Merge "Non-system users can now have restricted profiles" 2015-08-28 21:44:54 +00:00
Robert Greenwalt
5799f42806 am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev 
* commit 'e3bcde94caf8440d5e3958a340b3d276d03f7691':
  Reduce CONNECTIVITY_CHANGE bcasts
 2015-08-28 21:36:39 +00:00
Jorim Jaggi
762320e7d1 am f757bed7: am 7b933895: am e3238e53: am b774e554: Optimize fp touch to wake: Shortcut for report next draw 
* commit 'f757bed7f7fa72528ab2d7225139d9d6f3b1021a':
  Optimize fp touch to wake: Shortcut for report next draw
 2015-08-28 20:48:51 +00:00
Jorim Jaggi
f757bed7f7 am 7b933895: am e3238e53: am b774e554: Optimize fp touch to wake: Shortcut for report next draw 
* commit '7b933895481813425358bcfe56e0c1afa902a6d2':
  Optimize fp touch to wake: Shortcut for report next draw
 2015-08-28 20:37:52 +00:00
Xiaohui Chen
86c69ddefd Cleanup USER_OWNER for cryptkeeper 
Bug: 19913735
Change-Id: I1105081aa2cb97d20afbd1e38d65c18c94e37a40
 2015-08-28 20:35:12 +00:00
Doris Liu
ee684556ce Correct isRunning() behavior for AnimatorSet 
isRunning() for an Animator indicates whether an animator has gone
past its start delay and not yet finished. As a subclass of Animator,
AnimatorSet should follow the same principle. The implemention prior
to this CL returns whether any child animation is running, which is
inconsistent with the javadoc for isRunning() and general behavior
for Animator.

Change-Id: Iece814dfcd609ee292dbc00bd55dc64c7bda8e57
 2015-08-28 13:21:03 -07:00
Jorim Jaggi
e3238e53de am b774e554: Optimize fp touch to wake: Shortcut for report next draw 
* commit 'b774e554f32fd65cac30b43d1cf679403ef4af82':
  Optimize fp touch to wake: Shortcut for report next draw
 2015-08-28 20:19:31 +00:00
Jorim Jaggi
b774e554f3 Optimize fp touch to wake: Shortcut for report next draw 
When telling window manager that Keyguard window is in the correct
state for a fp-touch-to-wake sequence, it takes more than 1 frame at
the moment because the signal that WM is waiting for the next draw
is delayed by one frame because it is posted at the end of the
runnable queue.

To correctly fix this, we should post it at the beginning at the
queue, but this is way too risky this late. Instead, add a isolated
SysUI hack to report it faster.

Bug: 23401557
Change-Id: Icf64101e27611c7c01d108123021b22186f1e70c
 2015-08-28 20:07:35 +00:00
Robert Greenwalt
74ab4fae90 Reduce CONNECTIVITY_CHANGE bcasts 
If an app uses the new api (requestNetwork) to bring up MMS, don't
mark it as a legacy request.  This was done because the messaging
service had to use a combination of new API and old
(requestRouteToHost) due to api problems.  This has been resolved
so don't mark these as legacy requests anymore.

The general stuff is still in for other types due to lack of testing
time but this should be removed altogether in the future.

bug:23350688
Change-Id: I41c27efb253c39d8af1357ae7916ed5315c716db
 2015-08-28 12:37:54 -07:00
Deepanshu Gupta
88db51084b Merge "Switch SimpleDateFormat to icu version" 2015-08-28 15:54:11 +00:00
Stefan Kuhne
400f29c37f Merge "Bring an activity to the front upon click & drag" 2015-08-28 15:28:37 +00:00
Skuhne
f36bb0ca99 Bring an activity to the front upon click & drag 
Clicking on the control area of a window should bring it to
the top and set the focus since it might be used as a drag
operation which would move / resize it.

Bug: 23179116
Change-Id: I672bfefa42dd85e962fe343aeb89167ce125f168
 2015-08-28 08:26:15 -07:00
John Reck
43c2091a65 Merge "Serializing display lists" 2015-08-28 15:09:55 +00:00
Keisuke Kuroyanagi
9f18132aae Merge "Fix: Cursor can be at an invalid offset in EditText." 2015-08-28 06:57:22 +00:00
Ashish Sharma
56d4ce51c2 am b804f413: am fec26a37: am 7c388b0f: am ffa3d040: am 3883e72a: Merge "BatteryStats: Bump checkin version" into mnc-dev 
* commit 'b804f4134a21989c94ead728b6d36f93a647ce36':
  BatteryStats: Bump checkin version
 2015-08-28 00:09:24 +00:00
Ashish Sharma
b804f4134a am fec26a37: am 7c388b0f: am ffa3d040: am 3883e72a: Merge "BatteryStats: Bump checkin version" into mnc-dev 
* commit 'fec26a37a15dc406ae6a3aee67059cb93ef2ae5a':
  BatteryStats: Bump checkin version
 2015-08-27 23:55:47 +00:00
Ashish Sharma
7c388b0f73 am ffa3d040: am 3883e72a: Merge "BatteryStats: Bump checkin version" into mnc-dev 
* commit 'ffa3d0408f9c3ffb5ab3ee45ef6c466d795fb2c8':
  BatteryStats: Bump checkin version
 2015-08-27 23:34:04 +00:00
Ashish Sharma
ffa3d0408f am 3883e72a: Merge "BatteryStats: Bump checkin version" into mnc-dev 
* commit '3883e72aeda7dcc5f76eba7ad2e95ad2cb041687':
  BatteryStats: Bump checkin version
 2015-08-27 23:28:22 +00:00
Ashish Sharma
3883e72aed Merge "BatteryStats: Bump checkin version" into mnc-dev 2015-08-27 23:21:16 +00:00