17034 Commits

Author SHA1 Message Date
justinzhang
ed32c842c6 Merge "DevicePolicyManager Authentication for Lock Task" 2014-05-08 20:35:12 +00:00
Emily Bernier
86e8029079 Merge "New user restrictions for EDU" 2014-05-08 19:51:50 +00:00
Winson Chung
8f17b57582 Merge "Listening for system changes to active recent tasks. (Bug 14260718)" 2014-05-08 19:37:19 +00:00
justinzhang
511e0d8323 DevicePolicyManager Authentication for Lock Task
Here we let DevicePolicyManager keep a list of tasks that are
allowed to start the lock task mode. This list can only be set by
a device owner app. The ActivityManager will call
DevicePolicyManager to check whether a given task can start the
lock task mode or not.

Change-Id: I650fdae43fc35bf9fd63452283f4e2bbadd11551
Bug: 14611303
2014-05-08 15:00:14 -04:00
Jose Lima
ca0c0ba764 Merge "Remove unecessary code from ActivityStack" 2014-05-08 18:56:53 +00:00
Jason Monk
56cf1ab410 Fix Global Proxy when used with PAC
Since PAC needs to relay the local proxy port back to the
ConnectivityService it ends up calling handleApplyDefaultProxy...
This works fine for PAC on WiFi, but when tested on global proxy
(not currently used anywhere), it sets the mDefaultProxy.  This
mDefaultProxy does not get cleared when the global proxy is cleared
and requires a reboot to get things cleared out.

This CL adds a check to overwrite mGlobalProxy rather than
mDefaultProxy in this use case.

Change-Id: I92782d11e213b91f8ddda2faaf996a7252273fc3
2014-05-08 13:46:26 -04:00
Jose Lima
729cb2391f Remove unecessary code from ActivityStack
- Due to a previous CL to allow activities to be visible under
   the Home stack, some code un ActivityStack became unecessary.
   - This CL removes the uused code and changes the interface of
   ensureActivitiesVisibleLocked, since we no longer need to
   special case visibility for the Home stack.

Change-Id: I5cffe903bc82041fe79bfc63107df71ddf01232c
2014-05-08 10:15:05 -07:00
Kenny Guy
26ecbefea0 Merge "Limit package launcher apps callback to enabled users." 2014-05-08 12:54:39 +00:00
Sander Alewijnse
5c082dd22f Merge "Add API to disable account management for certain types of accounts." 2014-05-08 12:49:10 +00:00
Amith Yamasani
63812fd9f2 Merge "Send boot_completed for users started in the background" 2014-05-08 12:22:02 +00:00
Dan Sandler
b325c80d3d Merge "Quantum notification improvements." 2014-05-08 11:30:46 +00:00
Sander Alewijnse
5c02db60be Add API to disable account management for certain types
of accounts.

The account types with disabled account management are stored in a
blacklist in the active admin object, editable by profile owners.

Change-Id: I57dc5f709ad79674fa28dd006969283585daea24
2014-05-08 12:28:07 +01:00
Christoph Studer
1c3f81fde9 Record notification events to a local SQLite DB
Bug: 13672846
Change-Id: I911573ba943487b3f4f18349d318215bd183d991
2014-05-08 10:47:23 +02:00
Dan Sandler
26e81cf14b Quantum notification improvements.
New API introduced here: Notification.color (and
Builder.setColor()), allowing apps to specify an accent
color to be used by the template. The Quantum templates
(which are now the only kind we support) use this when
creating a circular background to draw behind the smallIcon
in the expanded form.

Additionally, the quantum and legacy templates are no longer
in superposition; all apps using Builder will get quantum.

Change-Id: Iac5e2645cc5c2346ed458763f2280ae9c6368b62
2014-05-08 01:21:55 -04:00
Vinit Deshapnde
011e1b35a6 Initial implementation of WifiScanner
This change implements basic functionality of WifiScanner. Following
functionality is enabled

1. Scanning - specify a list of channels to scan
2. Significant change detection
3. AP hotlist

Change-Id: Ieef75b96bdbbd3c7d9b9e698bd16e64d3b465254
2014-05-07 21:14:24 -07:00
vandwalle
c4bfcc12e9 Merge "initial Best Network Selection implementation" 2014-05-08 03:03:02 +00:00
Craig Mautner
221b336cc1 Merge "Account for windows on non-app display." 2014-05-08 02:24:02 +00:00
vandwalle
7c3606c103 initial Best Network Selection implementation
-add dhcpserver, defaultGwMAC address, linked configuration and user choices link lists to WiFiconfiguration
-add default gateway mac address to RouteInfo
-add a Date to the ScanResult
-add BSSID date to the WifiConfiguration
- make framework auto-join into a config option
- add Settings option for showing RSSI in Wifi picker view; add auto-join specific status to WifiConfiguration

Change-Id: I5cfc4f2a48c9f3bc9766e8e68e24eff7b57f2821

 Changes to be committed:
	modified:   core/java/android/provider/Settings.java
	modified:   wifi/java/android/net/wifi/ScanResult.java
	modified:   wifi/java/android/net/wifi/WifiConfiguration.java
2014-05-07 18:48:48 -07:00
Winson Chung
9f49df933f Listening for system changes to active recent tasks. (Bug 14260718) 2014-05-07 18:08:34 -07:00
Craig Mautner
f12fca4ba5 Merge "Use new doccentric flags and attributes in Sharing" 2014-05-08 00:59:54 +00:00
Craig Mautner
41db4a77fa Use new doccentric flags and attributes in Sharing
Put the new doccentric flags and attributes into use. And make their
first application the Share widget. Sharing now creates a new task
which is destroyed once the share action has completed.

Fixes bug 14463859.

Change-Id: I34c4c79775ef44d65e1967be5601997a2d46b210
2014-05-07 17:20:56 -07:00
Florin Malita
531fecca1c Merge "Encapsulate Canvas.mNativeCanvas" 2014-05-07 22:44:47 +00:00
Brian Carlstrom
dfad99ad9f resolved conflicts for merge of 0b5598c9 to master
Change-Id: Ie911d6b0b5e2b87e2b4669fa2465a82bb5807893
2014-05-07 15:24:01 -07:00
Brian Carlstrom
6422abef78 resolved conflicts for merge of 3bbef521 to master
Change-Id: I0bbb7c80f6c4f003779da784475d7acbfb898c94
2014-05-07 14:46:40 -07:00
Amith Yamasani
1a7eaaa50e Send boot_completed for users started in the background
Bug: 14587584

Change-Id: I7abfad0a7102376e1665b528f3fd110a4b6ed164
2014-05-07 14:16:46 -07:00
Emily Bernier
394a6cdd98 New user restrictions for EDU
New user restrictions will allow schools to prevent students from 1) using
device microphones, 2) adjusting device volume, and 3) mounting physical
external media.

Change-Id: Ib2fcb7ce8fbc489a25d2c97a122b2124012a9e3c
2014-05-07 17:04:58 -04:00
Brian Carlstrom
0b5598c924 am 691079dd: am a21ba5be: Merge "Add BackgroundDexOptService"
* commit '691079ddc0055fac9b82dccaf35b4591978b2a55':
  Add BackgroundDexOptService
2014-05-07 20:28:25 +00:00
Brian Carlstrom
3bbef521d4 resolved conflicts for merge of f2db00fd to klp-modular-dev-plus-aosp
Change-Id: I745164033962f6222832f8f19fa316a2e2634fd0
2014-05-07 13:20:23 -07:00
Jason Monk
f2e074604b Fix Build
Change-Id: I0035256b41199041bc1bc7d625f2c8f5a6a23e43
2014-05-07 15:59:10 -04:00
Jason Monk
54a9ebb509 Fix build
Change-Id: I87c037faee19b434be741104cdddb9c467f20606
2014-05-07 15:26:34 -04:00
Jason Monk
9d75ccb6a1 Merge "Make proxy API public" 2014-05-07 18:54:12 +00:00
Jason Monk
207900c23b Make proxy API public
Also exposed proxy-related functions that were on the
ConnectivityManager.

Change-Id: I9fb5f1bcc257a6198679ea1d56e18da2ec5a3b33
2014-05-07 14:23:53 -04:00
Kenny Guy
2871654830 Limit package launcher apps callback to enabled users.
Change-Id: I8e42756647025677203a7dfb1dd2d040ac6e32db
2014-05-07 18:41:29 +01:00
Craig Mautner
19ab828aa5 Account for windows on non-app display.
When an app launches a window on a different display than the one
the app is on, make sure and return the window's display, not the
app's display.

Fixes bug 12906650.

Change-Id: Ie418db023672f7944729fc60d457c4c1d850dc1f
2014-05-07 10:35:34 -07:00
RoboErik
153187d05b Merge "Add a class for managing Session priority" 2014-05-07 17:26:28 +00:00
RoboErik
780bee2633 Merge "Add APIs for creating a system priority session and getting controllers" 2014-05-07 17:26:16 +00:00
Adam Connors
010cfd4581 Add enableSystemApp methods to DevicePolicyManager
These methods allow profile or device owners to enable
systems apps pre-installed in the primary user in the
managed profile. Apps can be specified by either package
name or intent.

Bug: 13587051

Change-Id: Ifcbc68c139308506b6c18cf3c0ea62b8026ff75f
2014-05-07 16:20:38 +01:00
Jason Monk
10a38c06df Merge "Only show IME in navigation bar when it should" 2014-05-07 14:20:04 +00:00
Jason Monk
b605fecd9e Only show IME in navigation bar when it should
Add a flag to indicate that the IME should be shown.  This follows
the continuous ime notification boolean, and if there are multiple
input methods to choose from enabled.  This way the notification
and navigation button show up under the same circumstances (but
not on the same devices).

Change-Id: Ia6a2253061f1876f4bcc511de48c1078e9d96be5
2014-05-07 09:51:58 -04:00
Julia Reynolds
d46d0f9dcd Add new EDU user restrictions.
Change-Id: I6aad10466d99cda6be378c72025df686fe665071
2014-05-07 09:51:16 -04:00
Heather Lee Wilson
90372e1f1c am 6827949f: am d237cbac: Merge "Prevent crashing when disabling MCU during dream wakeup" into klp-modular-dev
* commit '6827949fc63699106b7fdc0c399b3fad8e015a79':
  Prevent crashing when disabling MCU during dream wakeup
2014-05-07 13:20:08 +00:00
Brian Carlstrom
691079ddc0 am a21ba5be: Merge "Add BackgroundDexOptService"
* commit 'a21ba5bec748e2f10d7e6d38181ec1124991cb60':
  Add BackgroundDexOptService
2014-05-07 03:33:41 +00:00
Brian Carlstrom
f2db00fdcd am edb88bcd: Merge "Use package usage information to decide what dex files to optimize in PackageManagerService"
* commit 'edb88bcd232176e575f2dbee2cfdb1bfbe33faef':
  Use package usage information to decide what dex files to optimize in PackageManagerService
2014-05-07 03:33:37 +00:00
Florin Malita
c677675e9c Encapsulate Canvas.mNativeCanvas
Currently, the native canvas is accessed/manipulated from several
unrelated classes.

In order to facilitate SaveFlags emulation, this CL encapsulates
the field and refactors its external users.

Two main changes:

* new getNativeCanvas() getter for use in Java-level clients.
* JNI canvas swappers (GraphicsBuffers, Surface, TextureView &
  AssetAtlasService) are refactored based on the exising/equivalent
  safeCanvasSwap() Canvas method.

Change-Id: I966bd4898f0838fb3699e226d3d3d51e0224ea97
2014-05-06 21:07:19 -04:00
Jungshik Jang
a9095ba488 Implement more native api for Hdmi cec.
HAL interface for CEC has more apis that haven't
connected with HdmiCecController.
Here is a list of apis.

1. addLogicalAddress
2. clearLogicalAddress
3. getPhysicalAddress
4. getVersion
5. getVendorId

Verified that it does not affect to other components in nakasi

Change-Id: I535bde47c43dd25bbede002c0a2aefbe86779076
2014-05-07 00:36:26 +00:00
Heather Lee Wilson
6827949fc6 am d237cbac: Merge "Prevent crashing when disabling MCU during dream wakeup" into klp-modular-dev
* commit 'd237cbac122cdb48e5b73db5a9c5f8d85ceebe55':
  Prevent crashing when disabling MCU during dream wakeup
2014-05-07 00:31:36 +00:00
RoboErik
a8f9514627 Add a class for managing Session priority
Priority is given first to the system priorty session, then to
active local sessions, then to active remote sessions, then to
the rest of the sessions. Ordering within categories is by whoever
last performed an action we associate with the user.

The stack has methods for getting filtered sets of this priority.

This also:
-Changes publish to setActive(boolean)
-Adds a flag for handling media buttons.
-Adds a flag for transport controls instead of enabling once.
-Unhides the setFlags API.
-Updates the legacy helper to use the flags.

Change-Id: I6ebeb27410de1b24149fd6e1785613ac444f0774
2014-05-06 17:26:06 -07:00
Winson Chung
5269a01c6d Merge "Fixing regression in calculating which activities to apply recents values to." 2014-05-06 23:46:00 +00:00
Winson Chung
3aeaebb6fc Fixing regression in calculating which activities to apply recents values to. 2014-05-06 15:44:36 -07:00
Heather Lee Wilson
9da8301e0a Prevent crashing when disabling MCU during dream wakeup
AmbientMode attempting to send message to DozeHardware no longer results in an
uncaught IllegalStateException.  The exception was crashing Android Wear when
DozeHardware had already been released by PowerManagementService at time of
AmbientMode's message.

Change-Id: I5956a453802b5b764e88638f6b6d899cbc94cc8d
2014-05-06 15:31:57 -07:00