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

22934 Commits

Author SHA1 Message Date
Winson Chung
c5f9ec3e27 am 675a0b6b: am 513aa792: am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev 
* commit '675a0b6bc9ee2f2e80f28381c0f34d98e0447ad6':
  Adding bounce animation for affiliated tasks. (Bug 16656169)
 2014-11-07 04:17:02 +00:00
Brian Carlstrom
900b2d913c am bb7388a8: am 14531903: am f4d2c8ee: Merge "Restore mLazyDexOpt behavior for eng builds" into lmp-mr1-dev 
* commit 'bb7388a86e8e9782cf8caf4d176cd2b8d16d752b':
  Restore mLazyDexOpt behavior for eng builds
 2014-11-07 04:15:39 +00:00
destradaa
22db164727 am 031550a3: am 9ed36c42: Merge "Add support for GPS measurement/navigation message capabilities. b/16727892 b/16815124" into lmp-mr1-dev automerge: 992b9aa 
* commit '031550a31e56bb8300ba9d1225004581ec156777':
  Add support for GPS measurement/navigation message capabilities. b/16727892 b/16815124
 2014-11-07 03:56:10 +00:00
Craig Mautner
f2859b514f am 587cdde2: am bc1fdca0: Add logging for failure to finish. automerge: a11bb74 
* commit '587cdde2e2bf7e833e433c1edd6e8078832e327c':
  Add logging for failure to finish.
 2014-11-07 03:56:05 +00:00
Sreeram Ramachandran
88d4f29654 am 64105c8f: am 2663cdcb: Merge "Send broadcasts when VPNs come and go." into lmp-mr1-dev automerge: 0cb1bc4 
* commit '64105c8f3a075bbdb1b552ed5b9942961b8499ad':
  Send broadcasts when VPNs come and go.
 2014-11-07 03:56:00 +00:00
destradaa
6550fa7452 am 91c962ad: am a084d357: Merge "Fix reference leak in GPS measurement JNI layer. b/16727892 b/17075171" into lmp-mr1-dev automerge: c3e5599 
* commit '91c962ad9c90e79b8dbbf7aaaaf2d827adf7cc16':
  Fix reference leak in GPS measurement JNI layer. b/16727892 b/17075171
 2014-11-07 03:55:54 +00:00
Jeremy Joslin
e4fb9419d8 am 93f515f9: am 91fff05b: Merge "Implemented requestNetwork with a PendingIntent." into lmp-mr1-dev automerge: 1a2b99e 
* commit '93f515f99030f3c8d54005cc0cf600ca06e215b1':
  Implemented requestNetwork with a PendingIntent.
 2014-11-07 03:55:38 +00:00
Craig Mautner
0fecad76d1 am 22254f50: am 39f6be12: Merge "More fixes for keyguard animations." into lmp-mr1-dev automerge: 7b1b0f6 
* commit '22254f504f10a0190792060de2820ccf7323a84f':
  More fixes for keyguard animations.
 2014-11-07 03:55:29 +00:00
Winson Chung
675a0b6bc9 am 513aa792: am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev 
* commit '513aa79290dd17400c4cce82d1d801c05ff3776f':
  Adding bounce animation for affiliated tasks. (Bug 16656169)
 2014-11-07 01:45:11 +00:00
Winson Chung
3ed9f2f903 Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev 2014-11-07 01:30:20 +00:00
Brian Carlstrom
bb7388a86e am 14531903: am f4d2c8ee: Merge "Restore mLazyDexOpt behavior for eng builds" into lmp-mr1-dev 
* commit '1453190388e789e27c775ebb8e96267e3c3c6eca':
  Restore mLazyDexOpt behavior for eng builds
 2014-11-07 00:46:16 +00:00
Brian Carlstrom
f4d2c8eebd Merge "Restore mLazyDexOpt behavior for eng builds" into lmp-mr1-dev 2014-11-07 00:39:09 +00:00
Andres Morales
7c71141505 am 98b07343: am 3e5d6aa0: am f33d9db4: am b1477d11: Merge "[DO NOT MERGE] Increase min free levels for cached processes on 64bit" into lmp-dev 
* commit '98b073434d0c55788c3e27887675c795c46c8b9d':
  [DO NOT MERGE] Increase min free levels for cached processes on 64bit
 2014-11-07 00:24:59 +00:00
destradaa
031550a31e am 9ed36c42: Merge "Add support for GPS measurement/navigation message capabilities. b/16727892 b/16815124" into lmp-mr1-dev automerge: 992b9aa 
* commit '9ed36c42d8c3731b8ca631292881110eb8897cec':
  Add support for GPS measurement/navigation message capabilities. b/16727892 b/16815124
 2014-11-07 00:07:30 +00:00
Craig Mautner
587cdde2e2 am bc1fdca0: Add logging for failure to finish. automerge: a11bb74 
* commit 'bc1fdca0bbc5a2295e15c0d5a84912cc325dd0ac':
  Add logging for failure to finish.
 2014-11-07 00:07:24 +00:00
Sreeram Ramachandran
64105c8f3a am 2663cdcb: Merge "Send broadcasts when VPNs come and go." into lmp-mr1-dev automerge: 0cb1bc4 
* commit '2663cdcb39cbb319c5d778b3bc0a6ebc6c6ea1b4':
  Send broadcasts when VPNs come and go.
 2014-11-07 00:07:19 +00:00
destradaa
91c962ad9c am a084d357: Merge "Fix reference leak in GPS measurement JNI layer. b/16727892 b/17075171" into lmp-mr1-dev automerge: c3e5599 
* commit 'a084d357d3fd0a5696998e786aeb10ff394f24d5':
  Fix reference leak in GPS measurement JNI layer. b/16727892 b/17075171
 2014-11-07 00:07:12 +00:00
Jeremy Joslin
93f515f990 am 91fff05b: Merge "Implemented requestNetwork with a PendingIntent." into lmp-mr1-dev automerge: 1a2b99e 
* commit '91fff05ba93b6c78e1744159f97bc0448e22115c':
  Implemented requestNetwork with a PendingIntent.
 2014-11-07 00:06:54 +00:00
Craig Mautner
22254f504f am 39f6be12: Merge "More fixes for keyguard animations." into lmp-mr1-dev automerge: 7b1b0f6 
* commit '39f6be121627303d9c485832c4b730867151d9f8':
  More fixes for keyguard animations.
 2014-11-07 00:06:42 +00:00
Andres Morales
3e5d6aa04b am f33d9db4: am b1477d11: Merge "[DO NOT MERGE] Increase min free levels for cached processes on 64bit" into lmp-dev 
* commit 'f33d9db43a30299e2dfd3585c0964af953766a09':
  [DO NOT MERGE] Increase min free levels for cached processes on 64bit
 2014-11-07 00:06:25 +00:00
Paul Lawrence
c7579101c9 am 202ab298: am b282cc30: am 3bde026a: am afb6b50e: Merge "DO NOT MERGE: Don\'t log passwords returned from vdc" into lmp-dev 
* commit '202ab2986c2ab61ea32845ea94af6e329c1fd83c':
  DO NOT MERGE: Don't log passwords returned from vdc
 2014-11-07 00:06:25 +00:00
Andres Morales
f33d9db43a am b1477d11: Merge "[DO NOT MERGE] Increase min free levels for cached processes on 64bit" into lmp-dev 
* commit 'b1477d11ca873db761dd378a5fea93b26d695f78':
  [DO NOT MERGE] Increase min free levels for cached processes on 64bit
 2014-11-06 23:57:25 +00:00
Andres Morales
b1477d11ca Merge "[DO NOT MERGE] Increase min free levels for cached processes on 64bit" into lmp-dev 2014-11-06 23:51:00 +00:00
Andres Morales
423c44dc91 [DO NOT MERGE] Increase min free levels for cached processes on 64bit 
Requires less memory pressure to start killing cached
processes.

Change-Id: Ia02f5aee115535badc900330b9361f0099203e4f
 2014-11-06 15:44:02 -08:00
destradaa
992b9aa37b Merge "Add support for GPS measurement/navigation message capabilities. b/16727892 b/16815124" into lmp-mr1-dev 2014-11-06 23:22:46 +00:00
Winson Chung
044d52934e Adding bounce animation for affiliated tasks. (Bug 16656169) 
Change-Id: I39e4a57c4e6b707d15513dacde2d40c23bb05058
 2014-11-06 14:02:35 -08:00
Craig Mautner
a11bb74271 Add logging for failure to finish. 
Will help with bug 17648830.

Change-Id: Ib73c14cee332649a3e57a4779814a394f7d13173
 2014-11-06 14:01:18 -08:00
Sreeram Ramachandran
0cb1bc488c Merge "Send broadcasts when VPNs come and go." into lmp-mr1-dev 2014-11-06 21:57:21 +00:00
destradaa
c3e5599cdc Merge "Fix reference leak in GPS measurement JNI layer. b/16727892 b/17075171" into lmp-mr1-dev 2014-11-06 21:50:40 +00:00
John Spurlock
6065f7d03b am 9d3abdd7: am df2fe430: am d69dacb0: Merge "Zen: Track next-alarm condition across reboots." into lmp-mr1-dev 
* commit '9d3abdd74231a645107740f831b72797605584e1':
  Zen: Track next-alarm condition across reboots.
 2014-11-06 21:08:55 +00:00
xinhe
3ac3c7106c am 9ac600c7: am eb6990ac: am 8161ed81: Merge "RSSI indicator says that SIMless device has a SIM" into lmp-mr1-dev 
* commit '9ac600c721e522083b96444c2b05af0072fd1f76':
  RSSI indicator says that SIMless device has a SIM
 2014-11-06 21:08:41 +00:00
Jeremy Joslin
1a2b99ea26 Merge "Implemented requestNetwork with a PendingIntent." into lmp-mr1-dev 2014-11-06 20:51:24 +00:00
Craig Mautner
7b1b0f63bc Merge "More fixes for keyguard animations." into lmp-mr1-dev 2014-11-06 20:49:36 +00:00
Jeff Hao
2a83226c75 Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-sprout-dev 2014-11-06 20:45:01 +00:00
John Spurlock
9d3abdd742 am df2fe430: am d69dacb0: Merge "Zen: Track next-alarm condition across reboots." into lmp-mr1-dev 
* commit 'df2fe4306f18da28ace2882fee669e113744a566':
  Zen: Track next-alarm condition across reboots.
 2014-11-06 20:36:02 +00:00
Paul Lawrence
b282cc308f am 3bde026a: am afb6b50e: Merge "DO NOT MERGE: Don\'t log passwords returned from vdc" into lmp-dev 
* commit '3bde026aebffdaea8ab1315977b05e53e4a75185':
  DO NOT MERGE: Don't log passwords returned from vdc
 2014-11-06 20:34:49 +00:00
John Spurlock
d69dacb06f Merge "Zen: Track next-alarm condition across reboots." into lmp-mr1-dev 2014-11-06 20:27:07 +00:00
Craig Mautner
42d04db459 More fixes for keyguard animations. 
Add a state machine for calling comeOutOfSleepIfNeededLocked() so
that it is only called after the lockscreen has started dismissing
but not before resumeTopActivityLocked(). Also keep
resumeTopActivityLocked() from being called from
comeOutOfSleepIfNeededLocked() recursively.

Have starting windows count towards notifying the keyguard that a
window has been drawn.

Do not update wallpaper animations based on their not being included
in the windows being animated if there are no windows being animated.

And always improve logging.

Fixes bug 15991916.

Change-Id: I0d21c5337f0e89d9eacc8dab2cdaa52fec43ac0b
 2014-11-06 12:13:23 -08:00
xinhe
9ac600c721 am eb6990ac: am 8161ed81: Merge "RSSI indicator says that SIMless device has a SIM" into lmp-mr1-dev 
* commit 'eb6990ac93d03bde3842c454d02d6350bed213c1':
  RSSI indicator says that SIMless device has a SIM
 2014-11-06 19:59:31 +00:00
xinhe
8161ed8121 Merge "RSSI indicator says that SIMless device has a SIM" into lmp-mr1-dev 2014-11-06 19:50:45 +00:00
Jeremy Joslin
46e3ac8bbc Implemented requestNetwork with a PendingIntent. 
ConnectivityManager.requestNetwork(NetworkRequest, PendingIntent)
was unhidden and implemented.

Added ConnectivityManager.removePendingIntentRequest(PendingIntent) as
the companion method.

Bug: 17356414
Change-Id: I656a1e149cc1292c443ebfe9e61ee3eb5a80f143
 2014-11-06 11:43:27 -08:00
John Spurlock
7ab8ecd053 Zen: Track next-alarm condition across reboots. 
During a reboot, wait for the initial alarm registration -
which is traditionally done in response to ACTION_BOOT_COMPLETED.

Bug: 16373455
Change-Id: I00dd737fa5c9ea15d646779c5b92e5637a69595a
 2014-11-06 14:17:37 -05:00
xinhe
8b79fb6065 RSSI indicator says that SIMless device has a SIM 
For dummy case, subId = -1/-2, we need compare the phoneId
Bug:18247106

Change-Id: I310d8b466ef83936e920d3921267241f42c2243f
 2014-11-06 10:57:04 -08:00
Paul Lawrence
3bde026aeb am afb6b50e: Merge "DO NOT MERGE: Don\'t log passwords returned from vdc" into lmp-dev 
* commit 'afb6b50e824153de5e2f0c4d49dd95fde79fa04f':
  DO NOT MERGE: Don't log passwords returned from vdc
 2014-11-06 17:14:35 +00:00
Nicolas Prevot
1985f4963a am aa1185dc: am ea728d75: Merge "Add a cross-profile intent filter only if it wasn\'t previously added." into lmp-mr1-dev automerge: b9744c1 
* commit 'aa1185dc44347d1af713ec78b4a294683758b806':
  Add a cross-profile intent filter only if it wasn't previously added.
 2014-11-06 15:25:55 +00:00
Yuncheol Heo
4034241d99 am fb981efb: am 9188df6e: CEC: Allow no parameters with <System Audio Mode Request>. automerge: 0361147 
* commit 'fb981efbd0ba116433fc869ce3b1370a946eb057':
  CEC: Allow no parameters with <System Audio Mode Request>.
 2014-11-06 15:25:51 +00:00
Nicolas Prevot
aa1185dc44 am ea728d75: Merge "Add a cross-profile intent filter only if it wasn\'t previously added." into lmp-mr1-dev automerge: b9744c1 
* commit 'ea728d75ebb228822690365d147fc4021fb87ce9':
  Add a cross-profile intent filter only if it wasn't previously added.
 2014-11-06 15:20:57 +00:00
Yuncheol Heo
fb981efbd0 am 9188df6e: CEC: Allow no parameters with <System Audio Mode Request>. automerge: 0361147 
* commit '9188df6ef00a05fc15f2acf290e40c389ec7c847':
  CEC: Allow no parameters with <System Audio Mode Request>.
 2014-11-06 15:20:51 +00:00
Nicolas Prevot
b9744c1c1f Merge "Add a cross-profile intent filter only if it wasn't previously added." into lmp-mr1-dev 2014-11-06 09:42:47 +00:00
Yuncheol Heo
03611473bc CEC: Allow no parameters with <System Audio Mode Request>. 
Bug: 18266992
Change-Id: I4399e34d1178f3d4b17b4749ca543c2bb14c0765
 2014-11-06 08:27:58 +00:00