Alan Viverette
a83de9cf9d
am 17cdbe10: am 8f7812bc: am 20b9a6c4: am 9e84a6a0: Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev
...
* commit '17cdbe10616e38450064d758232f78c7cacc83f4':
Fix inaccurate TypedArray.getDrawable() documentation
2014-09-23 15:50:22 +00:00
Ruben Brunk
e2120388c8
am 969be13e: am abe74255: am d782ce53: am 979c03a2: Merge "camera2: Avoid spurious IDLE transitions." into lmp-dev
...
* commit '969be13ecc9ec7d9e35575d46f22fdd2da5866af':
camera2: Avoid spurious IDLE transitions.
2014-09-23 15:49:58 +00:00
Adam Lesinski
467475bab8
am 6b746c15: am 6c7ca6f5: am 7b7b7eb8: am 390a3f45: Merge "Revert behavior of Lockscreen Activity Launch to KK" into lmp-dev
...
* commit '6b746c150c7ec6ca41346224a0bc4a4d4910a472':
Revert behavior of Lockscreen Activity Launch to KK
2014-09-23 15:49:54 +00:00
Vineeta Srivastava
5d054b3b4e
am 2e8e7425: am a8ee7910: am a9f4fadd: am cd938b83: Merge "AT&T short dialing code" into lmp-dev
...
* commit '2e8e74250f0b8dda543a41a0903f9a56cef09f6e':
AT&T short dialing code
2014-09-23 15:49:45 +00:00
John Reck
5315ce4bf1
am fa19b7aa: am 8434cfaf: am ae26f177: am 668e566e: Merge "Aggressively trim memory for system_process" into lmp-dev
...
* commit 'fa19b7aa01e26d5a24e05b1bb963f9bd8d079bf7':
Aggressively trim memory for system_process
2014-09-23 15:49:41 +00:00
Dianne Hackborn
7367ed9aa9
am fbd5acbf: am 42540aed: am d2e6afcb: am bb9b4e06: Merge "Fix issue #17609716 : Frequent crash in system_server (RT restarts)" into lmp-dev
...
* commit 'fbd5acbff186b5f585b9506490c9039ceecc3326':
Fix issue #17609716 : Frequent crash in system_server (RT restarts)
2014-09-23 15:49:18 +00:00
Wink Saville
2ed12a198f
am d428d7bf: am 7491d876: am 7f969e42: Merge "Cleanup NetworkCapabilities." into lmp-sprout-dev
...
* commit 'd428d7bf62be4dbe39489947eaea98f6fc933e08':
Cleanup NetworkCapabilities.
2014-09-23 15:49:08 +00:00
Svetoslav
8b366ef3ee
am cd343325: am e821fc43: am 87c9fb76: am e9456781: Merge "Loosen the constraint for releasing a shared file." into lmp-dev
...
* commit 'cd3433251e0a1e1141ee11fd5b72864b56f6b807':
Loosen the constraint for releasing a shared file.
2014-09-23 15:48:51 +00:00
Svetoslav
95ba851d64
am f813b27b: am 68c883a5: am 02b80bea: am 3e3bbe7a: Merge "Fix a bug in parsing app widget state XML." into lmp-dev
...
* commit 'f813b27b71e6f7be8f04b4b95f73e38760ef86d5':
Fix a bug in parsing app widget state XML.
2014-09-23 15:48:46 +00:00
Alan Viverette
d9759ae5ae
am 8f7812bc: am 20b9a6c4: am 9e84a6a0: Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev
...
* commit '8f7812bc780935edea623cce086069925816bdc8':
Fix inaccurate TypedArray.getDrawable() documentation
2014-09-23 00:22:27 +00:00
Alan Viverette
51fc9ea5cd
am 20b9a6c4: am 9e84a6a0: Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev
...
* commit '20b9a6c458f998d1a5d3896e859a65371db9fce2':
Fix inaccurate TypedArray.getDrawable() documentation
2014-09-23 00:10:59 +00:00
Alan Viverette
60004caeba
am 9e84a6a0: Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev
...
* commit '9e84a6a08b4ff50b745a6eaf35e52b9c7aef4c39':
Fix inaccurate TypedArray.getDrawable() documentation
2014-09-22 23:58:31 +00:00
Ruben Brunk
000555d32f
am abe74255: am d782ce53: am 979c03a2: Merge "camera2: Avoid spurious IDLE transitions." into lmp-dev
...
* commit 'abe7425516933486c84e7009e65771ee3e86e6d5':
camera2: Avoid spurious IDLE transitions.
2014-09-22 23:52:47 +00:00
Adam Lesinski
e213d86d4b
am 6c7ca6f5: am 7b7b7eb8: am 390a3f45: Merge "Revert behavior of Lockscreen Activity Launch to KK" into lmp-dev
...
* commit '6c7ca6f57c02d775f9ad588977a84abb8efd8a33':
Revert behavior of Lockscreen Activity Launch to KK
2014-09-22 23:52:44 +00:00
Alan Viverette
53b5cc8773
Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev
2014-09-22 23:48:46 +00:00
Ruben Brunk
c50fb39328
am d782ce53: am 979c03a2: Merge "camera2: Avoid spurious IDLE transitions." into lmp-dev
...
* commit 'd782ce534d57c69cb280313b89180dac742937a8':
camera2: Avoid spurious IDLE transitions.
2014-09-22 23:41:58 +00:00
Adam Lesinski
408f24da80
am 7b7b7eb8: am 390a3f45: Merge "Revert behavior of Lockscreen Activity Launch to KK" into lmp-dev
...
* commit '7b7b7eb8929fbb0aa4729f3236a2f687fbb940df':
Revert behavior of Lockscreen Activity Launch to KK
2014-09-22 23:41:54 +00:00
Ruben Brunk
524d16f7eb
am 979c03a2: Merge "camera2: Avoid spurious IDLE transitions." into lmp-dev
...
* commit '979c03a21bc346ddbfbfcf5d1d4239e5cdf30302':
camera2: Avoid spurious IDLE transitions.
2014-09-22 23:29:55 +00:00
Adam Lesinski
a8b449b8b5
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:51 +00:00
Vineeta Srivastava
e49c6ed019
am a8ee7910: am a9f4fadd: am cd938b83: Merge "AT&T short dialing code" into lmp-dev
...
* commit 'a8ee7910c66749d0e3c15bf2abedcc5689f5d051':
AT&T short dialing code
2014-09-22 23:29:45 +00:00
John Reck
e3f815d432
am 8434cfaf: am ae26f177: am 668e566e: Merge "Aggressively trim memory for system_process" into lmp-dev
...
* commit '8434cfaf23cd9fa845ddb5f74fe22c5bfa22f14d':
Aggressively trim memory for system_process
2014-09-22 23:29:41 +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
Vineeta Srivastava
8ade9f9037
am a9f4fadd: am cd938b83: Merge "AT&T short dialing code" into lmp-dev
...
* commit 'a9f4fadd2d70311a25988f54b5c2f176c3e1592b':
AT&T short dialing code
2014-09-22 23:16:59 +00:00
Dianne Hackborn
50cc14d886
am 42540aed: am d2e6afcb: am bb9b4e06: Merge "Fix issue #17609716 : Frequent crash in system_server (RT restarts)" into lmp-dev
...
* commit '42540aed9042bf6a23d34d901d4479a9839faf98':
Fix issue #17609716 : Frequent crash in system_server (RT restarts)
2014-09-22 23:16:55 +00:00
John Reck
f4764c56e2
am ae26f177: am 668e566e: Merge "Aggressively trim memory for system_process" into lmp-dev
...
* commit 'ae26f1772b8ce9b5a67fc250cc5e409b3300510f':
Aggressively trim memory for system_process
2014-09-22 23:16:55 +00:00
Vineeta Srivastava
e2c975decc
am cd938b83: Merge "AT&T short dialing code" into lmp-dev
...
* commit 'cd938b83eac3ede61f82b9c62e9ac7c642e2e11c':
AT&T short dialing code
2014-09-22 23:10:42 +00:00
John Reck
6ed5ffebce
am 668e566e: Merge "Aggressively trim memory for system_process" into lmp-dev
...
* commit '668e566ec250a9548d6201c6190f80306e91dcce':
Aggressively trim memory for system_process
2014-09-22 23:10:37 +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
Dianne Hackborn
e9ed4fc770
am d2e6afcb: am bb9b4e06: Merge "Fix issue #17609716 : Frequent crash in system_server (RT restarts)" into lmp-dev
...
* commit 'd2e6afcbe6008c765371e0fa9ca8a39af058dbd8':
Fix issue #17609716 : Frequent crash in system_server (RT restarts)
2014-09-22 23:04:54 +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
Jing Zhao
184f0871f6
AT&T short dialing code
...
User should be able to dial 0 or 00 in AT&T network.
The code should not be taken as MMI Code.
Bug: 17314389
Change-Id: I7132f08b633c6539dc0dd4e2d7865adcda795913
2014-09-22 23:04:14 +00:00
John Reck
73840ea367
Aggressively trim memory for system_process
...
Bug: 16978006
Don't HWUI-accelerate KeyguardScrim
Aggressively trim memory as soon as a ViewRootImpl
dies or has its visibility changed.
Change-Id: Ie1b7c9d30653456bd2e9f309128174f972999368
2014-09-22 16:01:56 -07:00
Wink Saville
c57677d208
am 7491d876: am 7f969e42: Merge "Cleanup NetworkCapabilities." into lmp-sprout-dev
...
* commit '7491d8769bdba72b071d7589420fff0158e95bd1':
Cleanup NetworkCapabilities.
2014-09-22 22:58:41 +00:00
Dianne Hackborn
946a17782a
am bb9b4e06: Merge "Fix issue #17609716 : Frequent crash in system_server (RT restarts)" into lmp-dev
...
* commit 'bb9b4e06581a12d47d8a3da734dfebd1f26aa51b':
Fix issue #17609716 : Frequent crash in system_server (RT restarts)
2014-09-22 22:53:35 +00:00
Wink Saville
ee21c9b7c6
am 7f969e42: Merge "Cleanup NetworkCapabilities." into lmp-sprout-dev
...
* commit '7f969e42ad2c3b194a90e047e72998fb81e8cfa0':
Cleanup NetworkCapabilities.
2014-09-22 22:47:39 +00:00
Dianne Hackborn
5d47a09352
Merge "Fix issue #17609716 : Frequent crash in system_server (RT restarts)" into lmp-dev
2014-09-22 22:46:54 +00:00
Wink Saville
074e61569e
Merge "Cleanup NetworkCapabilities." into lmp-sprout-dev
2014-09-22 22:41:42 +00:00
Svetoslav
1dd82882a5
am e821fc43: am 87c9fb76: am e9456781: Merge "Loosen the constraint for releasing a shared file." into lmp-dev
...
* commit 'e821fc4335549c8618ee17d1e60de0e58f6f9ff9':
Loosen the constraint for releasing a shared file.
2014-09-22 22:14:02 +00:00
Svetoslav
bf0275d2c4
am 68c883a5: am 02b80bea: am 3e3bbe7a: Merge "Fix a bug in parsing app widget state XML." into lmp-dev
...
* commit '68c883a51a544ac2164ceb17b45cc42767e51f4b':
Fix a bug in parsing app widget state XML.
2014-09-22 22:13:58 +00:00
Svetoslav
277a8686c2
am 87c9fb76: am e9456781: Merge "Loosen the constraint for releasing a shared file." into lmp-dev
...
* commit '87c9fb7613a4ee7d815a2bcc36554fd35357075e':
Loosen the constraint for releasing a shared file.
2014-09-22 22:02:32 +00:00
Svetoslav
2a3ffefede
am 02b80bea: am 3e3bbe7a: Merge "Fix a bug in parsing app widget state XML." into lmp-dev
...
* commit '02b80bea002a97162637cf85b108cf0fbe658c3d':
Fix a bug in parsing app widget state XML.
2014-09-22 22:02:29 +00:00
Wink Saville
4e2dea77dc
Cleanup NetworkCapabilities.
...
Remove unused imports and variables.
Fix misspellings.
Added @Overrides.
Change-Id: I81f4adb0504e92d01c5465a0e14bc46d5ec3987e
2014-09-22 21:51:47 +00:00
Svetoslav
b889173558
am e9456781: Merge "Loosen the constraint for releasing a shared file." into lmp-dev
...
* commit 'e9456781c0b4d6ccc70a5378ecd802fd28554796':
Loosen the constraint for releasing a shared file.
2014-09-22 21:51:24 +00:00
Svetoslav
6d0c499cc6
am 3e3bbe7a: Merge "Fix a bug in parsing app widget state XML." into lmp-dev
...
* commit '3e3bbe7adcf9721eddcd3b6baa401f53f6e6d969':
Fix a bug in parsing app widget state XML.
2014-09-22 21:51:18 +00:00
John Spurlock
04b64cd0a4
am 91c77f04: am fbe1df94: am f8580a4c: am c018af27: Merge "Zen: Add events as a new config attribute." into lmp-dev
...
* commit '91c77f044b07df9c84529296c9bd01b374e894f9':
Zen: Add events as a new config attribute.
2014-09-22 21:51:13 +00:00
Alan Viverette
bbae954761
am 0019a3e7: am 171bbaad: am ebabff8d: am 39f73311: Merge "Remove trailing zeroes from vector drawable pathData" into lmp-dev
...
* commit '0019a3e7a786f88ceb979334fabca75122afe12c':
Remove trailing zeroes from vector drawable pathData
2014-09-22 21:51:09 +00:00
Svetoslav
a3df39cd24
Merge "Loosen the constraint for releasing a shared file." into lmp-dev
2014-09-22 21:40:00 +00:00