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

12412 Commits

Author SHA1 Message Date
Satoshi Kataoka
9371747e75 am 0e1c092a: am 2656abe0: Merge "Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected" into jb-mr1.1-dev 
* commit '0e1c092ab0ee0f2f499dba2bc51223e106f51964':
  Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected
 2012-11-17 21:59:18 -08:00
Satoshi Kataoka
0e1c092ab0 am 2656abe0: Merge "Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected" into jb-mr1.1-dev 
* commit '2656abe09895088eca25caafc3e92869217d1447':
  Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected
 2012-11-17 21:56:09 -08:00
Satoshi Kataoka
2656abe098 Merge "Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected" into jb-mr1.1-dev 2012-11-17 21:53:10 -08:00
Michael Jurka
3a22636222 am 3366a5d5: am cf474b1a: am 7b0c8779: Merge "Delete appWidgetId when removing lockscreen widgets" into jb-mr1.1-dev 
* commit '3366a5d54eccbbe861bcc765653664d80eae5398':
  Delete appWidgetId when removing lockscreen widgets
 2012-11-16 15:37:08 -08:00
Michael Jurka
3366a5d54e am cf474b1a: am 7b0c8779: Merge "Delete appWidgetId when removing lockscreen widgets" into jb-mr1.1-dev 
* commit 'cf474b1a10a1349d0d6d6f7cbb5d48489bacfb09':
  Delete appWidgetId when removing lockscreen widgets
 2012-11-16 15:34:20 -08:00
Michael Jurka
cf474b1a10 am 7b0c8779: Merge "Delete appWidgetId when removing lockscreen widgets" into jb-mr1.1-dev 
* commit '7b0c877959ee15c766cc7366ec6b4c024c211cd6':
  Delete appWidgetId when removing lockscreen widgets
 2012-11-16 15:31:07 -08:00
Michael Jurka
7b0c877959 Merge "Delete appWidgetId when removing lockscreen widgets" into jb-mr1.1-dev 2012-11-16 15:29:17 -08:00
Craig Mautner
7636dfbc33 Do not clear AppWindowToken.allDrawn while animating. 
Creating new surfaces for applications clears the allDrawn flag in the
AppWindowToken. If the app windows were animating when this happened
the animation would complete immediately resulting in jank. This fix
defers clearing allDrawn until the animation completes.

Bug 7326635 fixed.

Change-Id: I5abe3b9ecfbefb476de6a6c8acc394373cc11751
 2012-11-16 15:24:11 -08:00
Michael Jurka
75b5cfb4a4 Delete appWidgetId when removing lockscreen widgets 
Bug: 7550012

Change-Id: Ia9f5266256016eb91bfd6a2d5a7f910c42948f1e
 2012-11-16 15:22:06 -08:00
Amith Yamasani
32f0742e52 Only wipe device if primary user (for failed password attempts) 
When a DeviceAdmin requests a device wipe due to a number of incorrect
password attempts, only primary user can wipe the device. Secondary users
can only remove themselves from the device.

Bug: 7554445
Change-Id: I24331cb4eff37571fcd792abb2efc794f7b3f2d2
 2012-11-16 15:09:13 -08:00
Robert Greenwalt
60bfacd8ef Merge "Support for dns domain." 2012-11-16 12:56:56 -08:00
Amith Yamasani
f9f1ca9e96 am 8f97174a: am 4ad8a4bd: am acddb72c: Merge "Make sure that the owner user is marked initialized." into jb-mr1.1-dev 
* commit '8f97174a9c9ea637301ffc19bb64369b74e1ab54':
  Make sure that the owner user is marked initialized.
 2012-11-16 11:37:34 -08:00
Robert Greenwalt
8058f62189 Support for dns domain. 
bug:6799630
Change-Id: I10070eddb65b7b60f0bc2b3e1e320e1aa4ec6e98
 2012-11-16 11:25:32 -08:00
Amith Yamasani
8f97174a9c am 4ad8a4bd: am acddb72c: Merge "Make sure that the owner user is marked initialized." into jb-mr1.1-dev 
* commit '4ad8a4bd89c0a93705864e9beda39065b34545d6':
  Make sure that the owner user is marked initialized.
 2012-11-16 10:50:29 -08:00
Amith Yamasani
4ad8a4bd89 am acddb72c: Merge "Make sure that the owner user is marked initialized." into jb-mr1.1-dev 
* commit 'acddb72c58dbab029d1acbaea61755e79ef8b2a4':
  Make sure that the owner user is marked initialized.
 2012-11-16 10:47:11 -08:00
Amith Yamasani
acddb72c58 Merge "Make sure that the owner user is marked initialized." into jb-mr1.1-dev 2012-11-16 10:43:48 -08:00
Adam Cohen
de9e974e7c am a2d25079: am 5a0f5ba2: am 6189888a: Merge "Making sure launcher doesn\'t show keyguard-only widgets (issue 7550090)" into jb-mr1.1-dev 
* commit 'a2d250791d73396ee1f7c6bc90757defccee4669':
  Making sure launcher doesn't show keyguard-only widgets (issue 7550090)
 2012-11-16 10:42:40 -08:00
Adam Cohen
f5983a9511 am af958dce: am b82ee0c7: am b02eb4bb: Merge "Pushing state persistence to a background thread" into jb-mr1.1-dev 
* commit 'af958dce341b0046808d544a040445bd2941f6a1':
  Pushing state persistence to a background thread
 2012-11-16 10:38:19 -08:00
Jeff Sharkey
8e2ffc76a9 am 9634e970: am bfea4f04: am f5377a72: Merge "Useful annotations for code documentation." into jb-mr1.1-dev 
* commit '9634e970679c687572e2da84250adc8baf91a8c3':
  Useful annotations for code documentation.
 2012-11-16 10:37:59 -08:00
Jeff Sharkey
f99ddad6e3 am 91b57293: am 64f369a5: am a319d655: Merge "Avoid runtime restart after vold reconnects." into jb-mr1.1-dev 
* commit '91b57293233e005ce97c655578c775aaaf95a745':
  Avoid runtime restart after vold reconnects.
 2012-11-16 10:37:50 -08:00
Jeff Sharkey
0ace4de5c2 am f838eb40: am fa0fb7c5: am f6ba84b4: Merge "Reduce verbosity of service event logging." into jb-mr1.1-dev 
* commit 'f838eb40e8f53263c10d251ec4ec72f167f82541':
  Reduce verbosity of service event logging.
 2012-11-16 10:37:42 -08:00
Daniel Sandler
3639beff7a am 8ff32d81: am 00679b5b: am 020d6529: Merge "Do not vibe when the default notification sound is Silent." into jb-mr1.1-dev 
* commit '8ff32d81134cc6a73b9c58e720e8d2ad79a9c119':
  Do not vibe when the default notification sound is Silent.
 2012-11-16 10:36:23 -08:00
Daniel Sandler
c89da9e28a am 1812b345: am 2bb5dc6a: am 83b25961: Merge "Notification vibration improvements:" into jb-mr1.1-dev 
* commit '1812b3450389b37bc069061cc69cb20754816f62':
  Notification vibration improvements:
 2012-11-16 10:36:19 -08:00
Anders 3 Fridlund
36bc5b67eb Move NTP updates outside locks 
When the ServerThread handles ACTION_SHUTDOWN intent it sometimes get
stuck on mStatsLock in NetworkStatsService.java.
0  com.android.server.net.NetworkStatsService$5.onReceive()
1  android.app.LoadedApk$ReceiverDispatcher$Args.run()
2  android.os.Handler.handleCallback()
3  android.os.Handler.dispatchMessage()
4  android.os.Looper.loop()
5  com.android.server.ServerThread.run()
This happens when the NetworkStats thread is already holding the
mStatsLock while updating NTP.
0  libcore.io.Posix.getaddrinfo()
1  libcore.io.ForwardingOs.getaddrinfo()
2  java.net.InetAddress.lookupHostByName()
3  java.net.InetAddress.getAllByNameImpl()
4  java.net.InetAddress.getByName()
5  android.net.SntpClient.requestTime()
6  android.util.NtpTrustedTime.forceRefresh()
7  com.android.server.net.NetworkStatsService.performPoll()
8  com.android.server.net.NetworkStatsService.access$100()
9  com.android.server.net.NetworkStatsService$2.onReceive()
10 android.app.LoadedApk$ReceiverDispatcher$Args.run()
11 android.os.Handler.handleCallback()
12 android.os.Handler.dispatchMessage()
13 android.os.Looper.loop()
14 android.os.HandlerThread.run()
Since the NTP update consists of several socket operations it may get
stuck long enough to trigger a System Server Watchdog even though the
socket timeout is set to 20 second.
Further, the NTP update doesn't actually need to be performed inside
the locks and an attempt to change this was made earlier, but the code
wasn't actually moved outside the locks.

Change-Id: Ib37a2b8c2d51a01adb7ff01764f82309433703f0
 2012-11-16 13:28:29 +01:00
Satoshi Kataoka
15451bd7af Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected 
Bug: 7540140
Change-Id: Iaac951ff457c35751b442e84ac07f1f86be93494
 2012-11-16 13:30:56 +09:00
Craig Mautner
923584df77 Merge "Fix math errors causing black screen." 2012-11-15 16:30:47 -08:00
Adam Cohen
a2d250791d am 5a0f5ba2: am 6189888a: Merge "Making sure launcher doesn\'t show keyguard-only widgets (issue 7550090)" into jb-mr1.1-dev 
* commit '5a0f5ba269c12889246acbbe546ef75285231430':
  Making sure launcher doesn't show keyguard-only widgets (issue 7550090)
 2012-11-15 15:02:16 -08:00
Adam Cohen
5a0f5ba269 am 6189888a: Merge "Making sure launcher doesn\'t show keyguard-only widgets (issue 7550090)" into jb-mr1.1-dev 
* commit '6189888a2565b6362b0dd022850b748f628500d0':
  Making sure launcher doesn't show keyguard-only widgets (issue 7550090)
 2012-11-15 14:59:33 -08:00
Adam Cohen
6189888a25 Merge "Making sure launcher doesn't show keyguard-only widgets (issue 7550090)" into jb-mr1.1-dev 2012-11-15 14:56:19 -08:00
Adam Cohen
3fcc6b26c3 Making sure launcher doesn't show keyguard-only widgets (issue 7550090) 
Change-Id: I5d0675f0c03677e06371a6730209c3466c6b0f15
 2012-11-15 14:53:31 -08:00
Amith Yamasani
bc9625059b Make sure that the owner user is marked initialized. 
This is required for upgrades from previous versions of JB.

Bug: 7547639
Change-Id: I21de14a70d6ba2ab21437b5f0721321df45226d2
 2012-11-15 14:43:13 -08:00
Craig Mautner
a7233fe31a Fix math errors causing black screen. 
Turning off animations in the Developer options creates a ValueAnimator
duration scale of 0. This is used as the denominator in RampAnimator
which, if the numerator is also 0, sets mAnimatedValue to NaN. Rounding
NaN to the nearest int produces 0 which is then assigned to
mScreenBrightness in DisplayPowerState.

A copy mistake which assigned mTransitionAnimationScale as the default
value for mAnimatorDurationScale in WindowManagerService is also
fixed here.

Bug 7515609 fixed.

Change-Id: I39f8d0a7abdd5a1fe70d757fe95fbddaf7a0ed51
 2012-11-15 14:25:14 -08:00
Adam Cohen
af958dce34 am b82ee0c7: am b02eb4bb: Merge "Pushing state persistence to a background thread" into jb-mr1.1-dev 
* commit 'b82ee0c7bb7fc3ef61e0c31193641e87aecddfe6':
  Pushing state persistence to a background thread
 2012-11-15 13:59:25 -08:00
Adam Cohen
b82ee0c7bb am b02eb4bb: Merge "Pushing state persistence to a background thread" into jb-mr1.1-dev 
* commit 'b02eb4bb7d09a19aedb9dbc08b0f731af05a8579':
  Pushing state persistence to a background thread
 2012-11-15 13:55:45 -08:00
Adam Cohen
b02eb4bb7d Merge "Pushing state persistence to a background thread" into jb-mr1.1-dev 2012-11-15 13:53:53 -08:00
Adam Cohen
a1a2f967e2 Pushing state persistence to a background thread 
Change-Id: If776bc22c48525ba91dc7e4dd0e27de92612f2f5
 2012-11-15 13:44:34 -08:00
Jeff Sharkey
9634e97067 am bfea4f04: am f5377a72: Merge "Useful annotations for code documentation." into jb-mr1.1-dev 
* commit 'bfea4f04f226f1adf374412628d5945c380382a7':
  Useful annotations for code documentation.
 2012-11-15 11:56:19 -08:00
Jeff Sharkey
91b5729323 am 64f369a5: am a319d655: Merge "Avoid runtime restart after vold reconnects." into jb-mr1.1-dev 
* commit '64f369a542952a8ac0d22d7d6c4c793a29ebfc52':
  Avoid runtime restart after vold reconnects.
 2012-11-15 11:54:38 -08:00
Jeff Sharkey
bfea4f04f2 am f5377a72: Merge "Useful annotations for code documentation." into jb-mr1.1-dev 
* commit 'f5377a7242d71e221807150f0778a0521e1270b6':
  Useful annotations for code documentation.
 2012-11-15 11:53:19 -08:00
Jeff Sharkey
f838eb40e8 am fa0fb7c5: am f6ba84b4: Merge "Reduce verbosity of service event logging." into jb-mr1.1-dev 
* commit 'fa0fb7c508dfa4275389a52b7c7907d2032f4aaa':
  Reduce verbosity of service event logging.
 2012-11-15 11:51:45 -08:00
Jeff Sharkey
64f369a542 am a319d655: Merge "Avoid runtime restart after vold reconnects." into jb-mr1.1-dev 
* commit 'a319d655e336ffb0fcbee65b77926a32660c7f3f':
  Avoid runtime restart after vold reconnects.
 2012-11-15 11:51:33 -08:00
Jeff Sharkey
f5377a7242 Merge "Useful annotations for code documentation." into jb-mr1.1-dev 2012-11-15 11:48:38 -08:00
Jeff Sharkey
fa0fb7c508 am f6ba84b4: Merge "Reduce verbosity of service event logging." into jb-mr1.1-dev 
* commit 'f6ba84b4242419f4765e0efcb5df82e37ad03faa':
  Reduce verbosity of service event logging.
 2012-11-15 11:47:40 -08:00
Jeff Sharkey
a319d655e3 Merge "Avoid runtime restart after vold reconnects." into jb-mr1.1-dev 2012-11-15 11:46:19 -08:00
Jeff Sharkey
f6ba84b424 Merge "Reduce verbosity of service event logging." into jb-mr1.1-dev 2012-11-15 11:44:13 -08:00
Jesse Hall
9a2609f76e Merge "Handle hotplug events as described instead of rescanning" 2012-11-15 09:33:40 -08:00
Björn Lundén
1129a85203 Framework: Use holo alert drawables 
Replaces the current usage of the GB alert
drawable with theme-consistent holo ones.

Change-Id: I8594ef8276db5bb0e192f3a541937d7281321043
 2012-11-15 15:32:02 +01:00
Daniel Sandler
8ff32d8113 am 00679b5b: am 020d6529: Merge "Do not vibe when the default notification sound is Silent." into jb-mr1.1-dev 
* commit '00679b5b467dbc19ce2223b5501976c5c3f66fa9':
  Do not vibe when the default notification sound is Silent.
 2012-11-15 06:17:35 -08:00
Daniel Sandler
1812b34503 am 2bb5dc6a: am 83b25961: Merge "Notification vibration improvements:" into jb-mr1.1-dev 
* commit '2bb5dc6a367ce869939728b2978be7ca61a4b8b8':
  Notification vibration improvements:
 2012-11-15 06:17:31 -08:00
Daniel Sandler
00679b5b46 am 020d6529: Merge "Do not vibe when the default notification sound is Silent." into jb-mr1.1-dev 
* commit '020d65290a6fe7dc5465d36c259ec62dcfd71c1f':
  Do not vibe when the default notification sound is Silent.
 2012-11-15 06:13:50 -08:00