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

11864 Commits

Author SHA1 Message Date
Kenny Root
b9594ce9eb KeyStore: stop using state() 
Change-Id: I721974fd95f8d1ab06a3fd1bbb4c9b4d9d1d7752
 2013-02-14 12:06:51 -08:00
Jesse Hall
bc18fe851c am fd1c028e: Merge "Handle hotplug events as described instead of rescanning" 
# Via Gerrit Code Review
* commit 'fd1c028e34fc559ccccebd18979ee85ec7821dea':
  Handle hotplug events as described instead of rescanning
 2013-02-07 17:41:44 -08:00
Jesse Hall
190fd9aeca Handle hotplug events as described instead of rescanning 
Hotplug events say which display they're for and whether the display
was connected or disconnected. Before, this info was ignored, and the
event just triggered a rescan of all displays. If a display was
disconnected and then reconnected quickly, the rescan would treat this
as a no-op or a device property change and wouldn't turn the display
on.

Now the display manager attempts to update its state with the change
the event describes. So a quick disconnect/connect cycle will cause
the display to be turned on since the display manager will have
updated its internal state to reflect the disconnect event, and will
treat the connect event as a new display rather than a device property
change.

Bug: 7491120
Change-Id: Ia83f7c96b7f16f4c1bed2a73e9b56b0bf7ee3984
 2013-02-07 21:59:41 +00:00
Jaikumar Ganesh
b9620a89bd am 9434c112: Merge "Services: Adding HSPAP info in Android" 
# By Arun Ravindran
# Via Gerrit Code Review (1) and Shuo Gao (1)
* commit '9434c112d1fef52ade78d7ef818daf981bf63bef':
  Services: Adding HSPAP info in Android
 2013-02-07 10:46:10 -08:00
Jaikumar Ganesh
9434c112d1 Merge "Services: Adding HSPAP info in Android" 2013-02-07 17:54:41 +00:00
Amith Yamasani
05f1f0ece8 am 555b07df: am 2c64b539: am 596532d9: Properly initialize recognition service if the recognizer component changed. 
* commit '555b07df08dd4c2472374d0767926ebab928dede':
  Properly initialize recognition service if the recognizer component changed.
 2013-01-22 15:48:10 -08:00
Amith Yamasani
555b07df08 am 2c64b539: am 596532d9: Properly initialize recognition service if the recognizer component changed. 
* commit '2c64b53976a99f28bc7c0612648581f9b93bf8b0':
  Properly initialize recognition service if the recognizer component changed.
 2013-01-22 15:46:25 -08:00
Amith Yamasani
2c64b53976 am 596532d9: Properly initialize recognition service if the recognizer component changed. 
* commit '596532d9dbea3460dbc989b0316c721ca69f4915':
  Properly initialize recognition service if the recognizer component changed.
 2013-01-22 15:43:53 -08:00
Amith Yamasani
596532d9db Properly initialize recognition service if the recognizer component changed. 
The getServiceInfo() call directly to IPackageManager does not throw an exception.
The return value needed to be checked for null.

Bug: 8031032
Change-Id: I701b9e8cf3b2406a3b35a486183330489b3d46f5
 2013-01-22 15:35:49 -08:00
Victoria Lease
79d59f0968 DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care. 
Change-Id: If87be5769b55368edaf4776189e8f6e51a21eb03

Conflicts:

	services/java/com/android/server/ServiceWatcher.java
 2013-01-16 17:37:21 -08:00
Christopher Tate
ec64c30bfc am cc52272b: am a3e79199: Merge "TIME_TICK was not occurred for one hour" 
* commit 'cc52272b4fa27ab36ba20e22a53f872fedc8bb45':
  TIME_TICK was not occurred for one hour
 2013-01-11 08:58:34 -08:00
Christopher Tate
cc52272b4f am a3e79199: Merge "TIME_TICK was not occurred for one hour" 
* commit 'a3e7919932199e2178792cbae8870e9b48c57523':
  TIME_TICK was not occurred for one hour
 2013-01-10 18:26:50 -08:00
Satoshi Kataoka
50fc82fdf0 am 30b074fc: am 2495d08a: am 5327322a: Merge "Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"" into jb-mr1.1-dev 
* commit '30b074fcbff6263db4044ff4e8f36eb5d4e136eb':
  Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"
 2013-01-10 18:20:56 -08:00
Satoshi Kataoka
30b074fcbf am 2495d08a: am 5327322a: Merge "Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"" into jb-mr1.1-dev 
* commit '2495d08a5c06556deb7c3993add337037b8b492e':
  Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"
 2013-01-10 18:17:35 -08:00
Satoshi Kataoka
5327322ab9 Merge "Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"" into jb-mr1.1-dev 2013-01-10 18:12:44 -08:00
Sascha Prueter
1ec3c2cced am 28608bbb: am d692ea6d: am b5e4835e: Merge "Improve heuristics for detecting wireless chargers." into jb-mr1.1-dev 
* commit '28608bbb2fb6daf3d261cb10eaeb1849781cf77d':
  Improve heuristics for detecting wireless chargers.
 2013-01-10 11:19:20 -08:00
Sascha Prueter
28608bbb2f am d692ea6d: am b5e4835e: Merge "Improve heuristics for detecting wireless chargers." into jb-mr1.1-dev 
* commit 'd692ea6dd297fbd39885525a29bdf6637a3640f2':
  Improve heuristics for detecting wireless chargers.
 2013-01-10 11:16:51 -08:00
Sascha Prueter
b5e4835e3a Merge "Improve heuristics for detecting wireless chargers." into jb-mr1.1-dev 2013-01-10 11:11:20 -08:00
Jeff Brown
3b971598ed Improve heuristics for detecting wireless chargers. 
On some devices, we need to apply heuristics to determine whether
the device is docked on a wireless charger because the charging
circuits do not provide sufficient information to know whether
the device is on the charger unless it is actually receiving
power.

The previous heuristics only considered the battery level to
suppress spurious dock signals.

The new heuristics also take into account whether the device
appears to have moved from its previous position on the dock.

Bug: 7744185
Change-Id: I5ba885dac25b37840b6db46b8a0f30968a06776c
 2013-01-10 10:01:56 -08:00
Satoshi Kataoka
9d08143fa7 Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled" 
This reverts commit 32b812054cce27d1c70b53ba8ac729c7186b105e

Bug: 7976890

Change-Id: I75ab60734153719b199cf7281d23f5eb1ad2d1bc
 2013-01-10 17:42:56 +09:00
Sungmin Choi
563914a9a1 TIME_TICK was not occurred for one hour 
TIME_TICK was not occurred at the end of DST for one hour

Step to reproduce:
1. Settings -> Date & time
2. uncheck Automatic date & time and Automatic time zone
3. select Time zone -> select Brussels
4. set date -> Oct. 28. 2012
5. set time -> 1:59 AM

Bug: 7922117
Change-Id: I2e78bd97b508d6a38471425cfbaca45fb4b89c1e
 2013-01-10 17:33:26 +09:00
Dianne Hackborn
9e6575bc52 am 854458f4: am 0287ca3c: am e62fa825: Merge from master: fix issue #7966357: Super lights out mode vs. volume dialog 
* commit '854458f4d52937f9a1385559d759bd8019eb3294':
  Merge from master: fix issue #7966357: Super lights out mode vs. volume dialog
 2013-01-09 19:01:26 -08:00
Dianne Hackborn
854458f4d5 am 0287ca3c: am e62fa825: Merge from master: fix issue #7966357: Super lights out mode vs. volume dialog 
* commit '0287ca3ca36ad98004ddabfa189105e6324a820e':
  Merge from master: fix issue #7966357: Super lights out mode vs. volume dialog
 2013-01-09 19:00:06 -08:00
Dianne Hackborn
e62fa82579 Merge from master: fix issue #7966357: Super lights out mode vs. volume dialog 
The volume panel now forces us out of the UI modes while it
is up.

Change-Id: If39fa33b1c52579bf5d376ce4722408cee3ca951
 2013-01-09 18:51:51 -08:00
Victoria Lease
380b45b805 am 73e243c4: Merge "Fix logging typos in GpsLocationProvider" 
* commit '73e243c4d271907d10f10b301b2d6854e1f63fe4':
  Fix logging typos in GpsLocationProvider
 2013-01-02 14:46:48 -08:00
Victoria Lease
73e243c4d2 Merge "Fix logging typos in GpsLocationProvider" 2013-01-02 14:15:51 -08:00
Magnus Eriksson
160c1ca117 Fix logging typos in GpsLocationProvider 
Change-Id: Ibf12947f3758defee990fbf685323334b8d1eeda
Signed-off-by: Magnus Eriksson <eriksson.mag@gmail.com>
 2012-12-21 21:07:28 +01:00
Irfan Sheriff
7f93e7d265 am 88fe4ebc: Merge "NsdService: Clear client info after resolution request is serviced." 
* commit '88fe4ebc0b6e0499f247b5d896778dd72304bf9f':
  NsdService: Clear client info after resolution request is serviced.
 2012-12-21 10:07:24 -08:00
Irfan Sheriff
88fe4ebc0b Merge "NsdService: Clear client info after resolution request is serviced." 2012-12-20 14:43:17 -08:00
satok
5ce0226708 am 7ad7b2c4: am 32b81205: Fix a bug where disabled auxilialy IME is unexpectedly re-enabled 
* commit '7ad7b2c437d10fb8e7221e6e28aa247217f93681':
  Fix a bug where disabled auxilialy IME is unexpectedly re-enabled
 2012-12-19 10:24:45 -08:00
satok
7ad7b2c437 am 32b81205: Fix a bug where disabled auxilialy IME is unexpectedly re-enabled 
* commit '32b812054cce27d1c70b53ba8ac729c7186b105e':
  Fix a bug where disabled auxilialy IME is unexpectedly re-enabled
 2012-12-19 10:23:04 -08:00
satok
32b812054c Fix a bug where disabled auxilialy IME is unexpectedly re-enabled 
Bug: 7872918

This is a serious issue which the disabled system auxilialy IME is unexpectedly re-enabled by re-building internal IMI cache.

Change-Id: I0727cc973dfaea9823194021ce94af8665b98373
 2012-12-19 21:06:57 +09:00
Jean-Baptiste Queru
48576911a2 Merge from AOSP staging branch 
Change-Id: Iad3df4845e6fae16c4ae6dbddcad0121d4775dcd
 2012-12-18 15:14:12 -08:00
Robert Greenwalt
9b64c4906b Merge "Return error upon attempt to use non-existent APN" 2012-12-18 11:02:52 -08:00
Mikael Hedegren
342a7cb69f Return error upon attempt to use non-existent APN 
startUsingNetworkFeature will ignore errors from
reconnect - causing ConnectivityService to send
faulty information back to requester.

Change-Id: I4e0fcc1addd84da409cdc1eed1a95d25d925e020
 2012-12-18 15:32:48 +01:00
Jamie Gennis
f8f147d167 am 81e3c9ed: am d2a21d7f: Merge "Fade recents thumbnail to transparent earlier." into jb-mr1.1-dev 
* commit '81e3c9ed66ce6968a331c4eafb969f66234d6e8a':
  Fade recents thumbnail to transparent earlier.
 2012-12-17 19:00:00 -08:00
Jamie Gennis
81e3c9ed66 am d2a21d7f: Merge "Fade recents thumbnail to transparent earlier." into jb-mr1.1-dev 
* commit 'd2a21d7fee7ba3c9596baf16cadc76dd607a5cb1':
  Fade recents thumbnail to transparent earlier.
 2012-12-17 18:57:22 -08:00
Craig Mautner
3be73abc69 Fade recents thumbnail to transparent earlier. 
Reduce the gpu load by fading the recents thumbnail to an alpha of
0.0 before the remaining animations are completed. When alpha hits
0 the gpu treats the layer as hidden and can merge the remaining
layers in time.

This is a partial fix for 7729214.

Change-Id: I9761bbd0554db6454c7eec0485be798b11672ff5
 2012-12-17 17:35:58 -08:00
John Spurlock
5eb9162761 am 7739a5ca: am f5df689a: Fix NPE inside DreamManagerService. 
* commit '7739a5ca673ba2264295641466569b2a1c788fe9':
  Fix NPE inside DreamManagerService.
 2012-12-14 10:31:16 -08:00
John Spurlock
7739a5ca67 am f5df689a: Fix NPE inside DreamManagerService. 
* commit 'f5df689aa65682ce9217405e4a6b686e94129e8f':
  Fix NPE inside DreamManagerService.
 2012-12-14 10:29:32 -08:00
John Spurlock
f5df689aa6 Fix NPE inside DreamManagerService. 
Bug:7741911
Change-Id: Icfc39b2d89f57bba79866030df85b822e3f73ae2
 2012-12-14 13:12:43 -05:00
Jeff Sharkey
764bc0a7ae am bf8de6a3: Merge "Remove unnecessary locking for screen broadcasts." 
* commit 'bf8de6a349e19b32a1577080a9d8bb7f92b2301f':
  Remove unnecessary locking for screen broadcasts.
 2012-12-12 11:06:36 -08:00
Jeff Sharkey
bf8de6a349 Merge "Remove unnecessary locking for screen broadcasts." 2012-12-12 10:41:20 -08:00
Robert Greenwalt
f6610e2d7d am 79e0e3fd: Merge "return value of String.replace() is ignored." 
* commit '79e0e3fd69ba6426da6575e0c778eff205318172':
  return value of String.replace() is ignored.
 2012-12-11 16:52:39 -08:00
Robert Greenwalt
79e0e3fd69 Merge "return value of String.replace() is ignored." 2012-12-11 16:34:35 -08:00
Christopher Tate
1de6239390 am 534de491: Merge "Make immersive mode public & imply update locking" into jb-mr1-aah-dev 
* commit '534de491e6522465a7ad12d7cba9b2f80deab364':
  Make immersive mode public & imply update locking
 2012-12-11 16:13:51 -08:00
Christopher Tate
534de491e6 Merge "Make immersive mode public & imply update locking" into jb-mr1-aah-dev 2012-12-11 16:11:00 -08:00
Kenny Root
8f276515ea am ae5cc868: am 2735795f: Merge "If freeCache deletes APK, give out of space error" into jb-mr1.1-dev 
* commit 'ae5cc8687b4fde98449cbec1fd9a610557ff1b5d':
  If freeCache deletes APK, give out of space error
 2012-12-11 15:12:49 -08:00
Kenny Root
ae5cc8687b am 2735795f: Merge "If freeCache deletes APK, give out of space error" into jb-mr1.1-dev 
* commit '2735795f5aa906fbfd885dbacee1de0b41b80bf0':
  If freeCache deletes APK, give out of space error
 2012-12-11 15:10:47 -08:00
Kenny Root
2735795f5a Merge "If freeCache deletes APK, give out of space error" into jb-mr1.1-dev 2012-12-11 15:07:54 -08:00