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

156911 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vinit Deshpande
6a781b8b8f am b74eaee8: am 14f0aba3: Merge "Fix documentation for Wifi ScanResult.timestamp" into lmp-dev 
* commit 'b74eaee83f6ae364648d88989b83a28647bd1df0':
  Fix documentation for Wifi ScanResult.timestamp
 2014-09-23 03:06:59 +00:00
Lorenzo Colitti
e99be2ead8 am a4695b30: am bb17a717: Merge changes I3ebf0cec,I8635472c into lmp-dev 
* commit 'a4695b308223cd57cc99ec86d69c95b866504e78':
  Add a throw route to the VPN endpoint.
  Support non-unicast route types: unreachable and throw.
 2014-09-23 03:06:49 +00:00
Amith Yamasani
df7d86dbb6 am 2bdcabef: am 278cdb36: Merge "Fix regression in launching CantAddAccountActivity for correct user" into lmp-dev 
* commit '2bdcabef77ef0d39d6e6df22c7120819ae9f5276':
  Fix regression in launching CantAddAccountActivity for correct user
 2014-09-23 03:06:35 +00:00
Dianne Hackborn
8261938cd1 am a1a5e7df: am 56a9f3ac: Merge "I am such an idiot." into lmp-dev 
* commit 'a1a5e7df33fbacd2bb6e850490b876e93d92ad1d':
  I am such an idiot.
 2014-09-23 03:06:29 +00:00
Yigit Boyar
c2899d195c am 9c644065: am 35b32c80: Merge "Remove unnecessary waits in TouchUtil\'s drag" into lmp-dev 
* commit '9c64406566683da6aef717ca9d673e0ba08133ab':
  Remove unnecessary waits in TouchUtil's drag
 2014-09-23 02:53:57 +00:00
Amit Mahajan
abd3e6f094 am 0f2da384: am e9259ce9: Merge "Don\'t disconnect data for some carrier" into lmp-dev 
* commit '0f2da384a04f8645bc61c8f03c2b78bfb307d656':
  Don't disconnect data for some carrier
 2014-09-23 02:53:32 +00:00
xinhe
7600a943e7 am 85691bcd: am f1524b5d: Merge "Fix for empty RSSI triangle after boot" into lmp-dev 
* commit '85691bcdac73164975bd63b9ec3709889e361e3f':
  Fix for empty RSSI triangle after boot
 2014-09-23 02:53:14 +00:00
Ruben Brunk
e3d89f1a87 am 7facb2a6: am 12f73fcf: Merge "camera2: Docs update for available AF modes." into lmp-dev 
* commit '7facb2a66781fcad0f1bcd9dc519d49786fd95c9':
  camera2: Docs update for available AF modes.
 2014-09-23 02:53:09 +00:00
Ruben Brunk
bd2a4887f4 am 2a59f748: am 4b3c7f85: Merge "camera2: Add missing whitebalance mapping." into lmp-dev 
* commit '2a59f7488e7ad070b9c7553b22b5d0c28ea99f1c':
  camera2: Add missing whitebalance mapping.
 2014-09-23 02:53:02 +00:00
Alan Viverette
3343c4dcee am 7b686bd8: am 9e84a6a0: Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev 
* commit '7b686bd8c6a1c06d262c4fa44c122a6e8f3d68b8':
  Fix inaccurate TypedArray.getDrawable() documentation
 2014-09-23 02:52:57 +00:00
Ruben Brunk
36dd2f3c91 am 2ccdbbe2: am 979c03a2: Merge "camera2: Avoid spurious IDLE transitions." into lmp-dev 
* commit '2ccdbbe29f5a58c32375633f3f3c218ecf45b24d':
  camera2: Avoid spurious IDLE transitions.
 2014-09-23 02:52:35 +00:00
Adam Lesinski
3803c45f7d am 1f18ceae: am 390a3f45: Merge "Revert behavior of Lockscreen Activity Launch to KK" into lmp-dev 
* commit '1f18ceae5c015ee6a27dc6e40bcfaa3141eb720f':
  Revert behavior of Lockscreen Activity Launch to KK
 2014-09-23 02:52:29 +00:00
Vineeta Srivastava
e0c073aaea am 7c2b7858: am cd938b83: Merge "AT&T short dialing code" into lmp-dev 
* commit '7c2b785853bdabffdc6b916ea885a6d86a8f25f6':
  AT&T short dialing code
 2014-09-23 02:52:21 +00:00
John Reck
7a5b01bc0e am 01b5cfaa: am 668e566e: Merge "Aggressively trim memory for system_process" into lmp-dev 
* commit '01b5cfaac7e72526d145b4c5ea706993321abaa9':
  Aggressively trim memory for system_process
 2014-09-23 02:52:16 +00:00
Dianne Hackborn
4c8188a6a5 am 895670c9: am bb9b4e06: Merge "Fix issue #17609716: Frequent crash in system_server (RT restarts)" into lmp-dev 
* commit '895670c918ca5ec691da7c4ae44df54fbf382a20':
  Fix issue #17609716: Frequent crash in system_server (RT restarts)
 2014-09-23 02:51:57 +00:00
Svetoslav
6b09ddc0db am 60a87205: am e9456781: Merge "Loosen the constraint for releasing a shared file." into lmp-dev 
* commit '60a8720562506d2a6e6e7671bcbf34daee4901db':
  Loosen the constraint for releasing a shared file.
 2014-09-23 02:51:36 +00:00
Svetoslav
7bdd6f790a am ecb8de97: am 3e3bbe7a: Merge "Fix a bug in parsing app widget state XML." into lmp-dev 
* commit 'ecb8de978e1791b9bed9c5dcba0fc37877e6b233':
  Fix a bug in parsing app widget state XML.
 2014-09-23 02:51:31 +00:00
Vinit Deshpande
6782aaa01b am 14f0aba3: Merge "Fix documentation for Wifi ScanResult.timestamp" into lmp-dev 
* commit '14f0aba327294f94d0f2c7f486b21c89aa2094f1':
  Fix documentation for Wifi ScanResult.timestamp
 2014-09-23 02:27:27 +00:00
Vinit Deshpande
3f242a1aff Merge "Fix documentation for Wifi ScanResult.timestamp" into lmp-dev 2014-09-23 02:17:08 +00:00
Lorenzo Colitti
c88fa1bf1a am bb17a717: Merge changes I3ebf0cec,I8635472c into lmp-dev 
* commit 'bb17a717750c558ece69344ecd93d96d4fbc4aca':
  Add a throw route to the VPN endpoint.
  Support non-unicast route types: unreachable and throw.
 2014-09-23 01:57:26 +00:00
Lorenzo Colitti
1e2b63d91d Merge changes I3ebf0cec,I8635472c into lmp-dev 
* changes:
  Add a throw route to the VPN endpoint.
  Support non-unicast route types: unreachable and throw.
 2014-09-23 01:46:48 +00:00
Amith Yamasani
a67a989de7 am 278cdb36: Merge "Fix regression in launching CantAddAccountActivity for correct user" into lmp-dev 
* commit '278cdb36bf99f6075af6e04a74c29a1701d21cff':
  Fix regression in launching CantAddAccountActivity for correct user
 2014-09-23 01:20:31 +00:00
Dianne Hackborn
114ddceba4 am 56a9f3ac: Merge "I am such an idiot." into lmp-dev 
* commit '56a9f3ac269c723895948bf524fe378a9afc6636':
  I am such an idiot.
 2014-09-23 01:09:22 +00:00
Amith Yamasani
fee7ad1619 Merge "Fix regression in launching CantAddAccountActivity for correct user" into lmp-dev 2014-09-23 01:09:11 +00:00
Dianne Hackborn
c7437dd7c0 Merge "I am such an idiot." into lmp-dev 2014-09-23 00:57:28 +00:00
Yigit Boyar
15fec3a044 am 35b32c80: Merge "Remove unnecessary waits in TouchUtil\'s drag" into lmp-dev 
* commit '35b32c8060fdd9eac9a1c62a07d554810a39e45c':
  Remove unnecessary waits in TouchUtil's drag
 2014-09-23 00:47:33 +00:00
Yigit Boyar
81d9304bda Merge "Remove unnecessary waits in TouchUtil's drag" into lmp-dev 2014-09-23 00:39:32 +00:00
Dianne Hackborn
4a1ef0b171 I am such an idiot. 
Seriously, don't look at this.  It is so dumb.

Brought up by issue #17307700: retarget a relinquished
task is not working

Change-Id: I947438d3502f75510e2974211bb78d31008eaa90
 2014-09-22 17:39:07 -07:00
Amit Mahajan
5756ea5d32 am e9259ce9: Merge "Don\'t disconnect data for some carrier" into lmp-dev 
* commit 'e9259ce9de43096ca1aaf24acb8fcb54c1f69583':
  Don't disconnect data for some carrier
 2014-09-23 00:24:13 +00:00
xinhe
6f3407c4a5 am f1524b5d: Merge "Fix for empty RSSI triangle after boot" into lmp-dev 
* commit 'f1524b5db229bc08b65df70e8da0e450d153cff3':
  Fix for empty RSSI triangle after boot
 2014-09-23 00:16:01 +00:00
Ruben Brunk
f272f27131 am 12f73fcf: Merge "camera2: Docs update for available AF modes." into lmp-dev 
* commit '12f73fcf874eccaea8e56a4ac547dc86ae9259a6':
  camera2: Docs update for available AF modes.
 2014-09-23 00:15:56 +00:00
Amit Mahajan
322582447e Merge "Don't disconnect data for some carrier" into lmp-dev 2014-09-23 00:15:31 +00:00
xinhe
abbc202431 Merge "Fix for empty RSSI triangle after boot" into lmp-dev 2014-09-23 00:13:22 +00:00
Ruben Brunk
fcb086c8e7 Merge "camera2: Docs update for available AF modes." into lmp-dev 2014-09-23 00:06:15 +00:00
Ruben Brunk
61e48e67d1 am 4b3c7f85: Merge "camera2: Add missing whitebalance mapping." into lmp-dev 
* commit '4b3c7f852a22c27bc31c3710c631ef5fae10788f':
  camera2: Add missing whitebalance mapping.
 2014-09-23 00:03:58 +00:00
Jing Zhao
2361b2d247 Don't disconnect data for some carrier 
In some network, deactivate PDP connection cause releasing of RRC connection,
which MM/IMSI detaching request needs. Without this detaching, network can
not release the network resources previously attached.
So we are avoiding data detaching on these networks.

Bug: 16207801
Change-Id: Ib2ccc04d67f313e1241872b17ab38416607b0b48
 2014-09-23 00:01:38 +00:00
Alan Viverette
748b46ab02 am 9e84a6a0: Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev 
* commit '9e84a6a08b4ff50b745a6eaf35e52b9c7aef4c39':
  Fix inaccurate TypedArray.getDrawable() documentation
 2014-09-22 23:58:42 +00:00
Ruben Brunk
9343c3cb7f Merge "camera2: Add missing whitebalance mapping." into lmp-dev 2014-09-22 23:57:20 +00:00
Alan Viverette
53b5cc8773 Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev 2014-09-22 23:48:46 +00:00
Ruben Brunk
c4f1566b03 am 979c03a2: Merge "camera2: Avoid spurious IDLE transitions." into lmp-dev 
* commit '979c03a21bc346ddbfbfcf5d1d4239e5cdf30302':
  camera2: Avoid spurious IDLE transitions.
 2014-09-22 23:29:28 +00:00
Adam Lesinski
523ca5ace4 am 390a3f45: Merge "Revert behavior of Lockscreen Activity Launch to KK" into lmp-dev 
* commit '390a3f459bf9ba6473f5ef93e4e37984980e1315':
  Revert behavior of Lockscreen Activity Launch to KK
 2014-09-22 23:29:23 +00:00
Alan Viverette
fde4e3b17a Fix inaccurate TypedArray.getDrawable() documentation 
The documentation implied that you could override
Resources.getDrawable(int) to load custom drawables, which is
not the case.

BUG: 16635905
Change-Id: I06c0febe2d6d4194ef5a31f167b378fe311b7a2d
 2014-09-22 16:19:51 -07:00
Ruben Brunk
c90b5ebbbf Merge "camera2: Avoid spurious IDLE transitions." into lmp-dev 2014-09-22 23:19:46 +00:00
Adam Lesinski
2e51cc6842 Merge "Revert behavior of Lockscreen Activity Launch to KK" into lmp-dev 2014-09-22 23:17:47 +00:00
Ruben Brunk
6f387098c2 camera2: Docs update for available AF modes. 
Bug: 17588783
Change-Id: If4010517e79b3a51bd6231424a10be672ff5a252
 2014-09-22 16:13:54 -07:00
Vineeta Srivastava
9c496f69ff am cd938b83: Merge "AT&T short dialing code" into lmp-dev 
* commit 'cd938b83eac3ede61f82b9c62e9ac7c642e2e11c':
  AT&T short dialing code
 2014-09-22 23:11:50 +00:00
John Reck
8b5ab0d7be am 668e566e: Merge "Aggressively trim memory for system_process" into lmp-dev 
* commit '668e566ec250a9548d6201c6190f80306e91dcce':
  Aggressively trim memory for system_process
 2014-09-22 23:11:45 +00:00
Vineeta Srivastava
4293d978d7 Merge "AT&T short dialing code" into lmp-dev 2014-09-22 23:05:50 +00:00
John Reck
c1dab7a201 Merge "Aggressively trim memory for system_process" into lmp-dev 2014-09-22 23:05:02 +00:00
Adam Lesinski
246a8bcadd Revert behavior of Lockscreen Activity Launch to KK 
There exists a lifecycle regression where launching an
app from the lockscreen (camera, etc.) causes a series
of onResume, onPause, onRestart, onStart, onResume.

This CL reverts the behavior to what it was in KK, which
is to say that the Launcher is first resumed/paused, then
the Activity being launched has a simple onRestart,onStart, onResume
lifecycle.

Bug:17459745
Change-Id: I04091d2f86a929ee972c8d6debc1beb033c135a8
 2014-09-22 16:04:32 -07:00