Jeff Sharkey
5ec9aed64c
Merge "Offer to stream and fsync() install sessions."
2014-05-22 23:52:41 +00:00
Griff Hazen
6b7b34849a
Merge commit 'e5b73ae2' into manualmerge
...
Conflicts:
api/current.txt
core/java/android/app/Notification.java
Change-Id: I3141ed6b456107b7e5aa8c0c9c98ffc1d77fdf75
2014-05-22 16:05:19 -07:00
Jeff Sharkey
78cc340c2d
Offer to stream and fsync() install sessions.
...
Installers are interested in both streaming APK data and establishing
a happens-after relationship to support resuming downloads after a
process kill or battery pull.
This exposes a generic OutputStream for writing, and hooks up flush()
to be a blocking call which returns only when all outstanding write()
data has been fsync()'ed to disk.
Tests to verify behavior.
Bug: 14975160
Change-Id: I38289867c80ac659163bb0c2158ef12d99cc570d
2014-05-22 15:54:16 -07:00
Griff Hazen
e5b73ae234
am c3104157: Api updates for wearable extensions to notifications
...
* commit 'c3104157d8f12238b0ac8cf6c6f963dadb44167c':
Api updates for wearable extensions to notifications
2014-05-22 22:44:35 +00:00
Christopher Tate
4e7a225589
Merge "Don't crash uninstalling updates to system apps"
2014-05-22 22:11:06 +00:00
Christopher Tate
f71ece48a1
Don't crash uninstalling updates to system apps
...
Bug 15167960
Change-Id: I606638292e524078f2859ba6be0a4861a4e01c00
2014-05-22 14:55:11 -07:00
Griff Hazen
c3104157d8
Api updates for wearable extensions to notifications
...
1. Move Extender outside of Builder
2. Rename apply/applyTo to extend
3. Move Wearable extenders into Notification.java
4. Collapse Builder model into single classes
5. Use Bundle for storage: no new parcelable types.
Minor fix to RemoteInput to use flags int for boolean options.
Change-Id: I40012fd0458ec103eabf75ed4c91f636e02f4c8f
2014-05-22 14:38:36 -07:00
Jorim Jaggi
b37637b6fd
Merge "Move clock and top padding while dismissing Keyguard."
2014-05-22 21:37:17 +00:00
Santos Cordon
5c013261a9
Merge "Adding ITelecommService definition for Telecomm."
2014-05-22 21:21:41 +00:00
vandwalle
567d3f461b
Merge "revert change preventing NULL SSID in a WifiConfiguration"
2014-05-22 20:59:45 +00:00
Jorim Jaggi
afc11f196c
Move clock and top padding while dismissing Keyguard.
...
Such translation. Much alpha. Very parallax. Wow.
Bug: 15163546
Change-Id: Id419acced94083cf6cd7abebbcf1d5a08439b0a7
2014-05-22 21:58:10 +02:00
Raph Levien
186213f28c
Merge "Roboto v2"
2014-05-22 19:37:03 +00:00
Lorenzo Colitti
a8aad1b65f
Merge "Fix Ethernet documentation."
2014-05-22 19:22:57 +00:00
Winson Chung
f13cd857e0
Merge "Removing unnecessary public values. (Bug 14995844)"
2014-05-22 19:20:14 +00:00
Aravind Akella
94e4d29eff
Merge "Hide Sensor.getRequiredPermission API."
2014-05-22 19:11:53 +00:00
John Spurlock
bba3f86f22
Merge "Honor Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS."
2014-05-22 19:03:08 +00:00
Jae Seo
b138300a27
Merge "Add more columns to TV metadata to enable newly requested use cases"
2014-05-22 19:02:46 +00:00
vandwalle
559486f081
revert change preventing NULL SSID in a WifiConfiguration
...
bug: 15114340
Change-Id: Ic66363fc7781a1d65e5b8647843a752c048145a1
2014-05-22 11:54:44 -07:00
Lorenzo Colitti
9c1ccc54a5
Fix Ethernet documentation.
...
1. Remove incorrect @return tag for void function.
2. Fix build breakage by removing the reference to
#ETHERNET_SERVICE, which is hidden.
Change-Id: Ia893464bafc8257e48e0bd710d27954b535fcece
2014-05-22 11:51:27 -07:00
John Spurlock
47e7b73958
Honor Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS.
...
Hide notifications on the lockscreen if the setting = 0.
Bug:15104826
Change-Id: I394f10a9958a3ee4d03198f21eb09b778e00903e
2014-05-22 14:32:20 -04:00
Winson Chung
6784f1c623
Removing unnecessary public values. (Bug 14995844)
2014-05-22 11:22:41 -07:00
Sebastien Hertz
5973815f27
am 0f293905: am b2db356d: am fc1ffe89: Merge "Report runtime information to DDMS"
...
* commit '0f293905646713a5e603f75e3fa92f14e9e650d1':
Report runtime information to DDMS
2014-05-22 18:01:16 +00:00
Julia Reynolds
ae52657e5f
Merge "Create deviceowner gated APIs for creating and removing users in devicepolicymanager."
2014-05-22 17:53:09 +00:00
Winson Chung
31d8b9333b
Merge "Invalidating screenshots when we resume the task that they were taken in. (Bug 13587139)"
2014-05-22 17:46:58 +00:00
Dianne Hackborn
02a217fad0
Merge "Battery monitoring fixes:"
2014-05-22 17:22:15 +00:00
Ihab Awad
f25ec6370a
Merge "Fix invalid format specifier in log message"
2014-05-22 17:17:20 +00:00
Victoria Lease
d0769f6981
Roboto v2
...
Fresh new revisions of our Roboto family of fonts, including family
aliases for sans-serif-medium and sans-serif-black. Enjoy!
Change-Id: I2337ccbd1767a7769deea885e0900f1ca4329779
2014-05-22 10:01:20 -07:00
Ihab Awad
9519ee7fb9
Fix invalid format specifier in log message
...
Bug: 15154713
Change-Id: Ia1f45eb568b31f02a7443def0dc9ef32a21e7f02
2014-05-22 09:49:34 -07:00
Dianne Hackborn
2d4b4ed681
Battery monitoring fixes:
...
- Improve monitoring of level changes to not be confused
when it goes up while draining or down while charging.
- Put back in connectivity service code to tell battery
stats about the interfaces.
- Turn back on reporting of mobile radio active state
from the RIL.
- Fix bug in marshalling/unmarshalling that would cause
the UI to show bad data.
Change-Id: I733ef52702894cca81a0813eccdfc1023e546fce
2014-05-22 09:43:18 -07:00
John Spurlock
3d0f8ebce8
Merge "Better wifi-enabled signal from network controller."
2014-05-22 16:23:09 +00:00
John Spurlock
a9cc0c035d
Better wifi-enabled signal from network controller.
...
The old "is wifi enabled" signal was geared toward the cluster
view. Since the clients of the callbacks are now only QS tiles,
make sure to plumb through the actual enabled value all the way
up to the tile.
Bug:15161053
Change-Id: I8b69c599f06d5b36e3f44dc666e1621840ffd927
2014-05-22 12:20:16 -04:00
Paul Jensen
985086276f
Merge "Implement bind-to-network functionality of android.net.Network."
2014-05-22 16:14:21 +00:00
Nicolas Prevot
f0ee5a795a
Merge "Correcting a bug related to Uri permissions."
2014-05-22 16:08:18 +00:00
Julia Reynolds
1e95839823
Create deviceowner gated APIs for creating and removing users in devicepolicymanager.
...
This will allow DMAgent to manage users for EDU's cart model user case.
Bug: 15015887
Change-Id: I1eadf1701cb75fc4b50eb1a0df1525eff818286e
2014-05-22 12:02:23 -04:00
Nicolas Prevot
dcb27fadcd
Correcting a bug related to Uri permissions.
...
Change-Id: I70765eb659151ce0c5af06075a844143c09429e8
2014-05-22 16:53:34 +01:00
Sebastien Hertz
0f29390564
am b2db356d: am fc1ffe89: Merge "Report runtime information to DDMS"
...
* commit 'b2db356dc8514e8b7546a04907217f02cd8b19e1':
Report runtime information to DDMS
2014-05-22 14:57:28 +00:00
Sebastien Hertz
b2db356dc8
am fc1ffe89: Merge "Report runtime information to DDMS"
...
* commit 'fc1ffe89db4bfe51856dadead2ed9c856a96ca65':
Report runtime information to DDMS
2014-05-22 14:53:22 +00:00
Yohann Roussel
7d66d76fbb
Merge "Fix ANR in multidexlegacytestservices."
2014-05-22 14:52:03 +00:00
Sebastien Hertz
fc1ffe89db
Merge "Report runtime information to DDMS"
2014-05-22 14:47:14 +00:00
Christoph Studer
36a9acb7eb
Merge "SysUI: Use SBN keys instead of IBinder keys"
2014-05-22 14:19:55 +00:00
George Mount
b284e30b40
Merge "fixed mIsReturning initialized too late."
2014-05-22 14:04:33 +00:00
Christoph Studer
540b01e024
SysUI: Use SBN keys instead of IBinder keys
...
In preparation of migrating to NotificationListenerService,
remove dependence on IBinder keys for notifications and switch
to SBN.getKey() instead.
Bug: 15131411
Change-Id: Ic272e4a05fde6481c734144c5b34c49b2f021649
2014-05-22 15:48:30 +02:00
Ruben Brunk
13ace57274
Merge "Javadoc fix."
2014-05-22 13:31:09 +00:00
Ruben Brunk
3e7fe434d0
Javadoc fix.
...
Change-Id: I4644ec782e636104fc06a27716f2fd224003e8d2
2014-05-22 06:30:16 -07:00
Robert Greenwalt
07fb5a884f
Merge "Move dis/enable of mobile data to Telephony"
2014-05-22 13:22:35 +00:00
Adrian Roos
4d5bf5ee5e
Merge "Only send notification activity intents after dismissing Keyguard"
2014-05-22 13:03:51 +00:00
Adrian Roos
995757e330
Merge "Remove dead TrustListeners"
2014-05-22 13:03:42 +00:00
Jorim Jaggi
aa7707ddc4
Merge "Fix weird state with QS expansion."
2014-05-22 12:27:51 +00:00
Jorim Jaggi
9cd731a013
Fix weird state with QS expansion.
...
Bug: 15147023
Change-Id: Ief32ee756e22b330e0fb63b0dab64aa83ffb9124
2014-05-22 14:26:06 +02:00
Christoph Studer
08a7b76441
Move more packages to framework2
...
Change-Id: Ib8e3c915479eb5bc029256934d522f3714071bc2
2014-05-22 14:22:26 +02:00