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

12209 Commits

Author SHA1 Message Date
Julia Reynolds
46c86c2bc3 Merge "Be more proactive about processing zen rules." 2015-09-01 19:59:36 +00:00
Julia Reynolds
8ac6303790 Be more proactive about processing zen rules. 
This compensates for the fact that zen rules are multiuser
and the zen_mode setting and ringer mode aren't.

Bug: 22875494
Change-Id: I8cdd791eabe13fc51d0c7544beecc96734b06276
 2015-09-01 15:00:11 -04:00
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
Selim Cinek
759ab5a8fe am 7f5128fd: am 406b60ac: am b8645fa7: am a7cad8e8: Merge "Fixed a bug where the secure camera would flash when rotated" into mnc-dr-dev 
* commit '7f5128fda49b207b49b932eec2df22ff2ef4ef8b':
  Fixed a bug where the secure camera would flash when rotated
 2015-09-01 16:08:44 +00:00
Bart Sears
87b4b53b53 am 937b0978: am aaebdd7f: am 02be9316: am 06fb3b2d: am 0e2e8589: Merge "Don\'t throttle "while idle" alarms while not dozing" into mnc-dev 
* commit '937b0978be5cda5ab4e12bc277dad42cde0e27b6':
  Don't throttle "while idle" alarms while not dozing
 2015-09-01 16:08:19 +00:00
Svetoslav Ganov
5abd431a87 am 3007cc30: am d1c6dca6: am bbd723ce: am 144c4ff0: am 4cb113ed: Merge "Fix a NPE when shutting down instrumentation" into mnc-dev 
* commit '3007cc30f224f560081091159c6f706b2ed0e4bc':
  Fix a NPE when shutting down instrumentation
 2015-09-01 16:07:41 +00:00
Filip Gruszczynski
ac6b74a4dc Merge "Move Configuration creation from Window Manager to Activity Manager." 2015-09-01 15:41:17 +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
Selim Cinek
7f5128fda4 am 406b60ac: am b8645fa7: am a7cad8e8: Merge "Fixed a bug where the secure camera would flash when rotated" into mnc-dr-dev 
* commit '406b60aca6c8b88f35c15ddbb30937fd6cfdc008':
  Fixed a bug where the secure camera would flash when rotated
 2015-08-31 20:58:05 +00:00
Bart Sears
937b0978be am aaebdd7f: am 02be9316: am 06fb3b2d: am 0e2e8589: Merge "Don\'t throttle "while idle" alarms while not dozing" into mnc-dev 
* commit 'aaebdd7f91163382065d3b56d57cafef5e46c7fd':
  Don't throttle "while idle" alarms while not dozing
 2015-08-31 20:40:48 +00:00
Selim Cinek
b8645fa79e am a7cad8e8: Merge "Fixed a bug where the secure camera would flash when rotated" into mnc-dr-dev 
* commit 'a7cad8e8a4d698bd3880299265760f5158073e2d':
  Fixed a bug where the secure camera would flash when rotated
 2015-08-31 20:37:26 +00:00
Selim Cinek
a7cad8e8a4 Merge "Fixed a bug where the secure camera would flash when rotated" into mnc-dr-dev 2015-08-31 20:27:48 +00:00
Bart Sears
02be93160a am 06fb3b2d: am 0e2e8589: Merge "Don\'t throttle "while idle" alarms while not dozing" into mnc-dev 
* commit '06fb3b2da8a57fdc5efe24ab9464e6e890740de6':
  Don't throttle "while idle" alarms while not dozing
 2015-08-31 20:16:53 +00:00
Bart Sears
06fb3b2da8 am 0e2e8589: Merge "Don\'t throttle "while idle" alarms while not dozing" into mnc-dev 
* commit '0e2e85898743a070a0c42036fa9d841694819a00':
  Don't throttle "while idle" alarms while not dozing
 2015-08-31 20:02:34 +00:00
Bart Sears
0e2e858987 Merge "Don't throttle "while idle" alarms while not dozing" into mnc-dev 2015-08-31 19:49:11 +00:00
Todd Kennedy
ecf9b05812 Merge "Tweak systrace calls" 2015-08-31 17:58:23 +00:00
Svetoslav Ganov
3007cc30f2 am d1c6dca6: am bbd723ce: am 144c4ff0: am 4cb113ed: Merge "Fix a NPE when shutting down instrumentation" into mnc-dev 
* commit 'd1c6dca6219099ca73df04a65cc4e62b2d8102f6':
  Fix a NPE when shutting down instrumentation
 2015-08-31 17:51:52 +00:00
Svetoslav Ganov
bbd723ce63 am 144c4ff0: am 4cb113ed: Merge "Fix a NPE when shutting down instrumentation" into mnc-dev 
* commit '144c4ff08a0be40e6b8af1bca269b33557923d71':
  Fix a NPE when shutting down instrumentation
 2015-08-31 17:33:09 +00:00
Svetoslav Ganov
144c4ff08a am 4cb113ed: Merge "Fix a NPE when shutting down instrumentation" into mnc-dev 
* commit '4cb113ed72b771d3148c00a025eb8bc949ff6a41':
  Fix a NPE when shutting down instrumentation
 2015-08-31 17:22:53 +00:00
Svetoslav Ganov
4cb113ed72 Merge "Fix a NPE when shutting down instrumentation" into mnc-dev 2015-08-31 17:16:23 +00:00
Daniel Estrada Alva
4d25f52ae1 Merge "Clean up Gps/Flp Hardware on shut-down." 2015-08-31 16:42:14 +00:00
Svet Ganov
a95f468d1f Fix a NPE when shutting down instrumentation 
bug:23657953

Change-Id: I7187c3d911de24abe20a2c462a10352dd741efed
 2015-08-30 11:00:31 -07:00
Jim Miller
20a17f4a1f am fe17d791: am 098cb247: am 3396a11e: am 3656975e: Merge "Run callbacks from fingerprintd through handler." into mnc-dr-dev 
* commit 'fe17d79173e753b6b2752c1a806a6f97a59f35b8':
  Run callbacks from fingerprintd through handler.
 2015-08-29 01:54:10 +00:00
Jim Miller
fe17d79173 am 098cb247: am 3396a11e: am 3656975e: Merge "Run callbacks from fingerprintd through handler." into mnc-dr-dev 
* commit '098cb2470fa8f13bb3da6267dd33495391b508cc':
  Run callbacks from fingerprintd through handler.
 2015-08-29 01:46:48 +00:00
Ian Pedowitz
c3008a698b am 80bed748: am 2e80aa73: am 6f75cb14: am 8d027e6d: am 3c227bf2: Merge "Show the ResolverActivity in dock mode" into mnc-dev 
* commit '80bed748170b24f57d6a2db92b00c6be34e8f36a':
  Show the ResolverActivity in dock mode
 2015-08-29 01:34:32 +00:00
Jim Miller
3396a11e35 am 3656975e: Merge "Run callbacks from fingerprintd through handler." into mnc-dr-dev 
* commit '3656975ef879175aa81cf6362a6a7ffc4a5a99fc':
  Run callbacks from fingerprintd through handler.
 2015-08-29 01:26:21 +00:00
Jim Miller
3656975ef8 Merge "Run callbacks from fingerprintd through handler." into mnc-dr-dev 2015-08-29 01:14:45 +00:00
Jim Miller
8b3c25a34a Run callbacks from fingerprintd through handler. 
This fixes a potential race condition on the client monitors
where an async event from fingerprintd could change the state
and disrupt communication with the clients.

Fixes bug 23633702

Change-Id: I69635ab768f1e8abefd0b0d8b8e73bb81e7b5695
 2015-08-29 01:12:46 +00:00
Ian Pedowitz
80bed74817 am 2e80aa73: am 6f75cb14: am 8d027e6d: am 3c227bf2: Merge "Show the ResolverActivity in dock mode" into mnc-dev 
* commit '2e80aa7302611b698897129c379907b18da89b91':
  Show the ResolverActivity in dock mode
 2015-08-29 00:57:55 +00:00
Ian Pedowitz
6f75cb1476 am 8d027e6d: am 3c227bf2: Merge "Show the ResolverActivity in dock mode" into mnc-dev 
* commit '8d027e6d523d13a9cf2a5cf4ef901cc3e78b901d':
  Show the ResolverActivity in dock mode
 2015-08-29 00:40:19 +00:00
Ian Pedowitz
8d027e6d52 am 3c227bf2: Merge "Show the ResolverActivity in dock mode" into mnc-dev 
* commit '3c227bf2418c6d1b6831f0fa7ad0442b0fcbdc07':
  Show the ResolverActivity in dock mode
 2015-08-29 00:31:29 +00:00
Ian Pedowitz
3c227bf241 Merge "Show the ResolverActivity in dock mode" into mnc-dev 2015-08-29 00:20:27 +00:00
Selim Cinek
90b5e07c70 Fixed a bug where the secure camera would flash when rotated 
Bug: 23602571
Change-Id: I9608a004d97ad27a0f4c6da8e9d955dc644b4941
 2015-08-28 17:05:56 -07:00
Todd Kennedy
1a35015719 Tweak systrace calls 
Tracing needed a few tweaks.

First, add overall tracing for all of the incoming methods that cause a
package to go through the install flow -- installPackageAsUser, installStage
and movePackage.

Second, add a few more traces for things such as dexopt.

Third, adjust some of the calls; avoid using the async trace methods
when they're not necessary, etc...

Change-Id: Iff47189ddad4478d9fbc6eac2f7031e54cba6271
 2015-08-28 15:19:38 -07:00
Fyodor Kupolov
3f1099b062 Merge "Non-system users can now have restricted profiles" 2015-08-28 21:44:54 +00:00
destradaa
b902698632 Clean up Gps/Flp Hardware on shut-down. 
Ensures that the GPS and FLP HAL interfaces are deinitialized upon
system shut-down. This gives a chance for the underlying HAL to
close cleanly any resources it could be holding.
Note this approach only works for a device's power-off, scenarios
such as adb shell stop / start cannot  be handled, because in such
cases the process is terminated sending SIGKILL to it.

Bug: 23279835
Bug: 23279593
Change-Id: I29b3306c0ae2b384d0542031080a15fdbe49dd71
 2015-08-28 14:03:26 -07:00
Chong Zhang
3c2d1fd84b am 7c8eb2b9: am 52e6d458: am 430778bd: am 482635e3: Merge "Fix deadlock when updating rotation" into mnc-dr-dev 
* commit '7c8eb2b9df3c0820c02421ab5ff3b11150bb9f12':
  Fix deadlock when updating rotation
 2015-08-28 20:37:16 +00:00
Chong Zhang
7c8eb2b9df am 52e6d458: am 430778bd: am 482635e3: Merge "Fix deadlock when updating rotation" into mnc-dr-dev 
* commit '52e6d458d6cf0af7bda45cb80262af6fc369799f':
  Fix deadlock when updating rotation
 2015-08-28 20:30:04 +00:00
Jeff Sharkey
3f4c298248 am 0551d5d9: am ac4fd070: am 90023609: am 71f15791: am d88152b4: Merge "Give shell permission to move apps." into mnc-dev 
* commit '0551d5d9ee2888779e9c37c9a509451ef65ef981':
  Give shell permission to move apps.
 2015-08-28 20:18:39 +00:00
Jeff Sharkey
0551d5d9ee am ac4fd070: am 90023609: am 71f15791: am d88152b4: Merge "Give shell permission to move apps." into mnc-dev 
* commit 'ac4fd0702e04be88b5aa7b539cf38195abd343c5':
  Give shell permission to move apps.
 2015-08-28 20:06:45 +00:00
Chong Zhang
430778bd75 am 482635e3: Merge "Fix deadlock when updating rotation" into mnc-dr-dev 
* commit '482635e34d0def1682ebc644db0636862994f649':
  Fix deadlock when updating rotation
 2015-08-28 20:06:44 +00:00
Chong Zhang
482635e34d Merge "Fix deadlock when updating rotation" into mnc-dr-dev 2015-08-28 19:57:57 +00:00
Jeff Sharkey
90023609cf am 71f15791: am d88152b4: Merge "Give shell permission to move apps." into mnc-dev 
* commit '71f1579190ee3658db15f55a4e5571f03ce431b6':
  Give shell permission to move apps.
 2015-08-28 19:48:26 +00:00