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

135856 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Ben Murdoch
f564c7fe86 resolved conflicts for merge of ecf09321 to master 
Change-Id: I7a440204dfc79f3b82bd95d3d1276158bf3d44a2
 2014-05-20 19:13:39 +01:00
Alan Viverette
d41b911680 Revert "Various API council fixes to drawables" 
This reverts commit a2146b713c3b2f3bf215cfd42b012cf31f2f6e8a.

Change-Id: I80d5e3e0d0bfa5eb18021e2783fa92a6f12d7bf8
 2014-05-20 10:51:38 -07:00
Alan Viverette
f31512eb17 Merge "Various API council fixes to drawables" 2014-05-20 17:45:52 +00:00
Alan Viverette
e5b082d6eb Various API council fixes to drawables 
BUG: 15089957
Change-Id: Ieaf468bbff092e68f6313d8a5ecccda8b753806d
 2014-05-20 10:45:22 -07:00
Andy Hung
b5eb843e4b Merge "Fix 64 bit long pointer size for media scanning" 2014-05-20 17:36:11 +00:00
Michael Wright
e4ca30503c resolved conflicts for merge of b3ce4b1b to master 
Change-Id: I7f9abc0eb75f7c7042037e73c8fdb67025a2ee2a
 2014-05-20 09:35:36 -07:00
Robert Greenwalt
a67be03f9e Add NetworkFactory names and unregistration. 
Some Factories come and go (Telephony) and so they need to be able to unregister.
Also, debugging is tough when the factories are anonymous, so add names for logging.

Lastly, only send single set of NetworkRequests to a newly registered NetworkFactory
and only send the requests.

Change-Id: I717d63363f25c446f8ecf38d933b1a35d744af6e
 2014-05-20 09:03:57 -07:00
Christoph Studer
05ad48206a Add ZEN and speedbump to NotificationListenerService 
Change-Id: I39fae5d77863e0d10cf236a096cc589167d146d3
 2014-05-20 17:03:22 +02:00
George Mount
646b1db458 Merge "Add to activity transition API as requested by consumers." 2014-05-20 14:52:50 +00:00
George Mount
41fc656b38 Merge "API Review: split out BidirectionalTypeConverter." 2014-05-20 14:51:39 +00:00
John Reck
1fcc3b1896 Merge "Baby steps" 2014-05-20 14:10:53 +00:00
Adrian Roos
2566bc82cc Merge "Fix typo causing immersive mode transition flickering." 2014-05-20 14:10:07 +00:00
George Mount
800d72b0e0 Add to activity transition API as requested by consumers. 
Change-Id: Iae01d7560770bab0ff9a1728d6552b98b17108ce
 2014-05-20 07:07:30 -07:00
Jason Monk
87be9ba1ea Merge "Fix reference to ProxyInfo extra" 2014-05-20 12:59:52 +00:00
Selim Cinek
37dd822089 Merge "Fixed measuring and layouting of the more card and expandableviews." 2014-05-20 12:48:22 +00:00
Selim Cinek
24d7cfa4d6 Fixed measuring and layouting of the more card and expandableviews. 
Change-Id: I2848b39c6498ce9ad197ed7bad8423c74b372419
 2014-05-20 14:38:08 +02:00
Adrian Roos
cffd1e42d3 Fix typo causing immersive mode transition flickering. 
Bug: 15095056
Change-Id: Ibc75bb4f61070f4cf00756ab1a216255e38932af
 2014-05-20 13:48:37 +02:00
Guang Zhu
47c6514eaa am cd98ecc6: am 6071e45a: Merge "add a command to list all bonded devices" into klp-modular-dev 
* commit 'cd98ecc66b968c5d5d0d12522c4c8c9b848bf181':
  add a command to list all bonded devices
 2014-05-20 09:58:35 +00:00
Wei Wang
05ee041453 Remove a hide tag link. 
Change-Id: I6781dcfcaf89c6b00e0641549f946b90e4543218
 2014-05-20 02:43:02 -07:00
Ben Murdoch
ecf09321c5 am e0d6a6b0: Merge "Add PackagManager flag for WebView system feature." into klp-modular-dev 
* commit 'e0d6a6b05b0861a5aa6dd8189de61a4da8d39dae':
  Add PackagManager flag for WebView system feature.
 2014-05-20 09:39:05 +00:00
Ben Murdoch
e0d6a6b05b Merge "Add PackagManager flag for WebView system feature." into klp-modular-dev 2014-05-20 09:32:43 +00:00
Michael Wright
b3ce4b1b78 am 889814ce: resolved conflicts for merge of 32912e0a to stage-aosp-master 
* commit '889814cee0ebcf70069d04d3ae77c97c09efb5a1':
  wallpaper: limit wallpaper width to sys.max_texture_size
 2014-05-20 09:28:40 +00:00
Guang Zhu
cd98ecc66b am 6071e45a: Merge "add a command to list all bonded devices" into klp-modular-dev 
* commit '6071e45a64ab764eb86603f2f4496cfd5c8de708':
  add a command to list all bonded devices
 2014-05-20 09:26:18 +00:00
Wei Wang
adf6aff5b0 Revert "Revert "APIs for BLE scan, scan filter, batch scan, onFound/onLost and multiple advertising."" 
This reverts commit b1d9fbc0f8dea0c77ed810190b325bfdaaf21789.

Change-Id: Ic8dec9385a7c763170ebeb1bcddd221c72f46e88
 2014-05-19 23:52:45 -07:00
Youngsang Cho
48bb35b965 Merge "Make mSessionCallback null in TvView.unbindTvInput" 2014-05-20 05:55:21 +00:00
Michael Wright
889814cee0 resolved conflicts for merge of 32912e0a to stage-aosp-master 
Change-Id: I140e2024bd0e6e81ab550718103d45220d8bde26
 2014-05-19 22:42:58 -07:00
Youngsang Cho
285ff430fa Make mSessionCallback null in TvView.unbindTvInput 
Bug: 15096705
Change-Id: I5a13f9ad648bafc76667cbda39bcb138cfbc5de2
 2014-05-20 14:37:01 +09:00
Wei Wang
319b40c9cf Revert "APIs for BLE scan, scan filter, batch scan, onFound/onLost and multiple advertising." 
This reverts commit 2c4e68a86b7a9b9f760a8907b93ff40ccad56c80.

Change-Id: I98c91343d886ebe22d0bf75a710fa0b0abf738b6
 2014-05-20 04:52:35 +00:00
Guang Zhu
6071e45a64 Merge "add a command to list all bonded devices" into klp-modular-dev 2014-05-20 04:36:48 +00:00
Guang Zhu
d22b2413b9 add a command to list all bonded devices 
Bug: 14601515

Change-Id: I3cc5bb664485ef768bb81f1f8870ed9bf62f8329
 2014-05-19 21:36:10 -07:00
Andy Hung
989540264a Fix 64 bit long pointer size for media scanning 
Bug: 14993718
Change-Id: I98989caddcca67c2b3257cead948382fddb066da
 2014-05-19 21:18:18 -07:00
Michael Wright
32912e0a73 Merge "wallpaper: limit wallpaper width to sys.max_texture_size" 2014-05-20 04:04:01 +00:00
Donghan Ryu
289c273ec4 wallpaper: limit wallpaper width to sys.max_texture_size 
Image wallpapers are created ~1.5x screen size.  On some devices this
may exceed the maximum supported texture size, which will either fail
allocation or fail to composite.

Bug 991597

Change-Id: I9948b09f6e00a724212e73d36901f2bbea42e2f4
 2014-05-20 12:00:31 +09:00
Wei Wang
62d5bc745a APIs for BLE scan, scan filter, batch scan, onFound/onLost and multiple 
advertising.

Change-Id: I1655eb9cffa890b6fe38108bf51078662e90bc03
 2014-05-19 19:40:49 -07:00
Wei Wang
51800847d9 Add a method to check whether a UUID is 32bit. 
Change-Id: I92e8bab560b2083e9f4855d28b3f54f2120ef628
 2014-05-19 19:37:05 -07:00
Selim Cinek
2f4a82af91 Merge "Fixed a big with the vetobutton, circumventing double tapping." 2014-05-20 02:27:17 +00:00
Selim Cinek
863834bd96 Fixed a big with the vetobutton, circumventing double tapping. 
Change-Id: Ie31d06fe4e2454cf6a3223bef75eca2c76f47b59
 2014-05-20 04:20:25 +02:00
Selim Cinek
e704324a01 Merge "Fixed several bugs introduced by the new background views." 2014-05-20 01:42:46 +00:00
Selim Cinek
c9c00ae2fa Fixed several bugs introduced by the new background views. 
Also notifications are now limited to 4U again.
Bug: 14880580

Change-Id: I05d19981ad1bb06687bf6c994608e21ac925a759
 2014-05-20 03:33:40 +02:00
John Spurlock
f3281e4a3c Merge "QuickSettings: cap touch feedback to panel." 2014-05-20 01:13:04 +00:00
John Spurlock
ee912bb8ed QuickSettings: cap touch feedback to panel. 
Bug:15089348
Change-Id: I0d9cc21d9888e1cc67f61c61dfae5e6c519ace1b
 2014-05-19 21:11:14 -04:00
Christopher Tate
f15e3bd9e5 Merge "Move the non-market install setting from Global to per-user Secure" 2014-05-20 01:10:05 +00:00
Christopher Tate
aa036a2db0 Move the non-market install setting from Global to per-user Secure 
Bug 13760585

Change-Id: I45b0fa87e72dc5c18d687261fb95cbea5d06163a
 2014-05-19 18:08:30 -07:00