135908 Commits

Author SHA1 Message Date
Winson Chung
c637482a80 Removing unnecessary proguard flag for removed info view. 2014-05-21 00:31:43 +00:00
Andres Morales
94a17b5f18 Merge "Revert "Adding INfcUnlockSettings and NfcUnlock interface class."" 2014-05-20 23:40:37 +00:00
Chris Craik
47a7d61e70 Merge "Clean up Outline API, method on drawable" 2014-05-20 23:27:21 +00:00
Winson Chung
7bb188521c Merge "Wrapping console logs." 2014-05-20 23:25:42 +00:00
Winson Chung
10f8139d3b Wrapping console logs. 2014-05-20 16:21:31 -07:00
Jim Miller
430259a1d8 Merge "Update FingerprintManager API after discussions." 2014-05-20 23:18:48 +00:00
Lorenzo Colitti
00592c2700 Merge "Move IP config from WifiConfiguration to IpConfiguration." 2014-05-20 23:15:50 +00:00
Maurice Lam
92dfff4bc8 Merge "Disable swipe-to-reveal nav bar / status bar during setup" 2014-05-20 23:15:42 +00:00
Jim Miller
90b6b63d1d Merge "Fix Keyguard PIN error message for N < 4." 2014-05-20 23:12:07 +00:00
Yuncheol Heo
cd47ecb690 Merge "Fix the wrong conversion of byte to int." 2014-05-20 22:53:13 +00:00
Jaewan Kim
6346155c5a Move IP config from WifiConfiguration to IpConfiguration.
This is so that Ethernet can use it in the future.

Bug: 7606609
Bug: 8687763

Change-Id: I5d1189682b13f1088848809604690648d8d9ecca
2014-05-20 15:24:10 -07:00
Amith Yamasani
863ddcc7ac Merge "Per-user telephony restrictions" 2014-05-20 22:20:06 +00:00
Julia Reynolds
37f4e44ae6 Merge "Add Device/Profile Owner gated apis for setting/getting blocked packages." 2014-05-20 22:19:02 +00:00
Amith Yamasani
9f6c25f57e Per-user telephony restrictions
Allow profile owners or administrators of restricted profiles
to restrict access to telephony features such as calling and
texting for a user.

Change-Id: I89f97608c07c647ad8a7b43fef9d1e6bc4a84e95
2014-05-20 15:13:28 -07:00
Julia Reynolds
4d40452154 Merge "Allow device/profile owners to update settings." 2014-05-20 22:10:46 +00:00
Yuhao Zheng
0c62e8eb30 Merge "Fix a boot failure due to Wifi / Wifi Passpoint" 2014-05-20 22:08:32 +00:00
Alan Viverette
3dfd5bae84 Merge "Various API review fixes to resources and drawables" 2014-05-20 22:06:12 +00:00
Julia Reynolds
966881e895 Add Device/Profile Owner gated apis for setting/getting blocked packages.
DMAgent currently needs to live in /system/priv-app in order to
(among other things) set and get blocked packages. These APIs will
get us closer to being able to move DMAgent out of priv-app.
Bug: 14945334

Change-Id: I108e2013c67409dca554acf78e3a710745900706
2014-05-20 17:59:58 -04:00
Julia Reynolds
da55165321 Allow device/profile owners to update settings.
Device owners can update Settings.Secure and Settings.Global settings.
Profile owners can update Settings.Secure settings.

DMAgent currently needs to live in /system/priv-app in order to
(among other things) update global and secure settings. This change will
get us closer to being able to move DMAgent out of priv-app.
Bug: 14965414

Change-Id: If2cc3a56de91bffde33b838ab8ecea2c32412803
2014-05-20 17:49:45 -04:00
Winson Chung
48dfae92d2 Merge "Removing the info pane." 2014-05-20 21:42:52 +00:00
Eric Laurent
c0e439f1b7 Merge "AudioSystem: add new audio device definitions" 2014-05-20 21:39:23 +00:00
Winson Chung
53dd1f7ffc Merge "Fixing transition to/from Recents with full screen apps." 2014-05-20 21:36:28 +00:00
Winson Chung
863db8a4e7 Removing the info pane.
Change-Id: I5486291144cbcb1b31a7e5b8a234e5ef7cf85325
2014-05-20 14:33:04 -07:00
Jorim Jaggi
112e5147f6 Merge "Fix invisible notification backgrounds." 2014-05-20 21:29:00 +00:00
Winson Chung
ae08441649 Fixing transition to/from Recents with full screen apps.
Change-Id: I2f400b6736581a37d38a75ee7194fc7cb6438460
2014-05-20 14:20:11 -07:00
Jorim Jaggi
3c3c3fc38c Fix invisible notification backgrounds.
Bug: 15094262
Change-Id: I37eeb03a6ebb595da6793cfc95aa159662ab3990
2014-05-20 23:17:44 +02:00
Yuhao Zheng
8a476edccd Fix a boot failure due to Wifi / Wifi Passpoint
Bug: 15060373
Change-Id: Ie72fd2e4b855c46a8f9ed12deb8b07fd0c29f522
2014-05-20 14:06:49 -07:00
RoboErik
23a42810e3 Merge "Add getMediaSession to RCC" 2014-05-20 21:02:18 +00:00
RoboErik
5f31737c68 Add getMediaSession to RCC
This is to make integration with Media notifications easier.

Change-Id: I783ae5c2620ff0e11bf5584604b9c9623850e2f0
2014-05-20 14:00:53 -07:00
Jeff Brown
b86b1027a3 am 9777fdb7: am b0a7f84b: am 63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown"
* commit '9777fdb7af696ca15906d03ad8aa7a3d8d51e4b3':
  Fix NullException in QwertyKeyListener.KeyDown
2014-05-20 20:47:29 +00:00
Jeff Brown
9777fdb7af am b0a7f84b: am 63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown"
* commit 'b0a7f84b6de20edc6337163a4a07e3c524991ddb':
  Fix NullException in QwertyKeyListener.KeyDown
2014-05-20 20:44:21 +00:00
Jeff Brown
b0a7f84b6d am 63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown"
* commit '63bf04d88bcc00876c30c9f2848da8c44b42185b':
  Fix NullException in QwertyKeyListener.KeyDown
2014-05-20 20:40:20 +00:00
Winson Chung
15f3e28819 Merge "Should not be closing system dialogs when Recents is hidden. (Bug 15109551)" 2014-05-20 20:37:58 +00:00
Jeff Brown
63bf04d88b Merge "Fix NullException in QwertyKeyListener.KeyDown" 2014-05-20 20:37:44 +00:00
Dianne Hackborn
3bf2723193 Merge "Delay the dispatching of non-wakeup alarms." 2014-05-20 20:25:08 +00:00
Dianne Hackborn
d4e6d467cd Delay the dispatching of non-wakeup alarms.
When the screen is off, there are no guarantees about when
non-wakeup alarms will be dispatched.  Historically they are
dispatched any time the device wakes up.  With this change,
we will delay the dispatch until sometime later.

The amount of delay is determined by how long the screen has
been off.  Currently there are three possible delays: up to
2 minutes if the screen has been off for less than 5 minutes;
up to 15 minutes if it has been off for less than 30 minutes;
and otherwise up to an hour.

When the screen is turned on or a wakeup alarm is dispatched,
all delayed alarms will also be dispatched.

Note that one of the things this delays is TIME_TICK, which
means the in many cases we won't deliver TIME_TICK until the
screen is in the process of waking up.  The current
implementation causes this to be delayed until the SCREEN_ON
broadcast is sent; we probably want to improve this to have
the power manager tell the alarm manager about the screen
turning on before it sends that broadcast, to help make sure
things like the lock screen can update their current time
before the screen is actually turned on.

In addition, switch all of the alarm stats to use the new
PendingIntent "tag" identifier for its operations, instead
of the old code to try to construct a pseudo-identifier
by retrieving the raw Intent.

Also add a new package manager command to immediately write
packages.xml.

Change-Id: Id4b14757cccff9cb2c6b36de994de38163abf615
2014-05-20 13:24:25 -07:00
Alan Viverette
3b5c4272db Various API review fixes to resources and drawables
BUG: 15025565
Change-Id: If00c85816f8288338967f7a85453d21f858f5ca7
2014-05-20 13:20:42 -07:00
Griff Hazen
51eb4e657c am 7ba69dd8: am 9e1379f1: Fix sdk docs build for framework from remote input api addition.
* commit '7ba69dd8bd428494c7a2848b5d3325d47cf4afbf':
  Fix sdk docs build for framework from remote input api addition.
2014-05-20 20:18:11 +00:00
Griff Hazen
b720abeee8 resolved conflicts for merge of 8f1e7ade to master
Change-Id: Icabc5d274502abf8d40116d373c9f9d0ac062386
2014-05-20 13:15:30 -07:00
Winson Chung
1bba1c8c1a Should not be closing system dialogs when Recents is hidden. (Bug 15109551)
Change-Id: Ia73753074ce620ede136cd4b156d6bfeadb900cf
2014-05-20 13:12:12 -07:00
Griff Hazen
7ba69dd8bd am 9e1379f1: Fix sdk docs build for framework from remote input api addition.
* commit '9e1379f1126c1101f69445572bd441b2211791fa':
  Fix sdk docs build for framework from remote input api addition.
2014-05-20 20:07:32 +00:00
Griff Hazen
9e1379f112 Fix sdk docs build for framework from remote input api addition.
Change-Id: I6a6f3df06d924fe72f67466d67d9feced8d8719f
2014-05-20 12:51:29 -07:00
Vinit Deshpande
3fff22173c Merge "Fix a runtime break caused by merge conflict" 2014-05-20 19:06:45 +00:00
Robert Greenwalt
eeb11cde21 Merge "Add NetworkFactory names and unregistration." 2014-05-20 19:03:45 +00:00
Mike Lockwood
304ebe60b2 Merge "USB: Fix race condition in acquiring global reference in UsbRequest JNI code" 2014-05-20 18:59:05 +00:00
Mike Lockwood
5633e37ec1 Merge "USB: Minor cleanup from API council review" 2014-05-20 18:58:35 +00:00
Vinit Deshpande
e715e8cc00 Fix a runtime break caused by merge conflict
Kwd changed the name of WifiHotspotService to PasspointService; and
the reference to the name was moved in master. Merge ended up picking
up incorrect name WifiPasspointService. This change fixes that.

Bug: 15106138
Change-Id: Ib6d8aee53db39314a9d98abcbd8e0863210de1bb
2014-05-20 11:50:17 -07:00
Griff Hazen
8f1e7aded3 am 5cadc3b0: Add RemoteInput, Grouping, and Extender to Notification api.
* commit '5cadc3b00aa775a63518383046c902b130e09b4c':
  Add RemoteInput, Grouping, and Extender to Notification api.
2014-05-20 18:41:46 +00:00
Mike Lockwood
b2a4658a63 USB: Fix race condition in acquiring global reference in UsbRequest JNI code
Fixes bug https://code.google.com/p/android/issues/detail?id=59467

Change-Id: I8365e1be4eb0f1f2da49b658af677b590a80e382
2014-05-20 11:33:35 -07:00
Mike Lockwood
fa2b3fc6cd USB: Minor cleanup from API council review
Bug: 15089961
Change-Id: I8a22fad94d2a52d2270c89240b2a47bd1cef17b5
2014-05-20 11:14:58 -07:00