Commit Graph

23662 Commits

Author SHA1 Message Date
Christoph Studer
cf9727b928 am 4b1cbaaf: am cd9eb9be: am 27ef0188: Merge "NoMan/SysUI: Clear LEDs only when entering the shade" into lmp-mr1-dev
* commit '4b1cbaaf4ec9f3f58a389496faacf77ee46fa2ed':
  NoMan/SysUI: Clear LEDs only when entering the shade
2014-12-02 19:14:29 +00:00
Christoph Studer
4b1cbaaf4e am cd9eb9be: am 27ef0188: Merge "NoMan/SysUI: Clear LEDs only when entering the shade" into lmp-mr1-dev
* commit 'cd9eb9bee788252cd6d6bcdb7fcdc5a5d0dcfe5c':
  NoMan/SysUI: Clear LEDs only when entering the shade
2014-12-02 19:08:13 +00:00
Marvin Paul
baecfda4d5 am e67cf731: am 364a8fe9: am 5aeed158: Merge "Added explicit sort order when fetching accounts." into lmp-mr1-dev
* commit 'e67cf73146cecce5be22264ca7c596b454ded08d':
  Added explicit sort order when fetching accounts.
2014-12-02 19:05:25 +00:00
Christoph Studer
cd9eb9bee7 am 27ef0188: Merge "NoMan/SysUI: Clear LEDs only when entering the shade" into lmp-mr1-dev
* commit '27ef018846fc88122bcb2c30ba86e99a5b3039d6':
  NoMan/SysUI: Clear LEDs only when entering the shade
2014-12-02 18:59:26 +00:00
Marvin Paul
e67cf73146 am 364a8fe9: am 5aeed158: Merge "Added explicit sort order when fetching accounts." into lmp-mr1-dev
* commit '364a8fe9a250093f46581ece2792a3bc7cc06446':
  Added explicit sort order when fetching accounts.
2014-12-02 18:54:29 +00:00
Junda Liu
b27dbd2151 am 92205a33: am 50e2d6c2: am ef6178a9: Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-dev
* commit '92205a33655f8a4f487e8d85a9d6d151d0db21a1':
  Add hasMatchedTetherApnSetting to telmgr API.
2014-12-02 18:52:28 +00:00
Christoph Studer
27ef018846 Merge "NoMan/SysUI: Clear LEDs only when entering the shade" into lmp-mr1-dev 2014-12-02 18:49:51 +00:00
Marvin Paul
364a8fe9a2 am 5aeed158: Merge "Added explicit sort order when fetching accounts." into lmp-mr1-dev
* commit '5aeed158df65847edac69761630dcd66b8f66eaa':
  Added explicit sort order when fetching accounts.
2014-12-02 18:45:53 +00:00
Junda Liu
92205a3365 am 50e2d6c2: am ef6178a9: Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-dev
* commit '50e2d6c2ce079c00531ecbcf112593cb0263e47a':
  Add hasMatchedTetherApnSetting to telmgr API.
2014-12-02 18:45:41 +00:00
Marvin Paul
5aeed158df Merge "Added explicit sort order when fetching accounts." into lmp-mr1-dev 2014-12-02 18:36:32 +00:00
Marvin Paul
48fcd4e175 Added explicit sort order when fetching accounts.
In SQLite, if a sort order is not specified then the ordering is
undefined. In pre-L, SQLite would order accounts by the primary key.
But in L, the newer SQLite version appears to be ordering accounts by
the name.

Bug 18453759

Change-Id: I6bf2b0de59eca4c69472b4279b9e4194c3d3471e
2014-12-02 18:30:57 +00:00
Junda Liu
50e2d6c2ce am ef6178a9: Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-dev
* commit 'ef6178a99c57b6de3dc02455e570f932b154b8e1':
  Add hasMatchedTetherApnSetting to telmgr API.
2014-12-02 18:23:49 +00:00
Craig Mautner
4bc4974374 am 8abe01aa: am a370d9d1: am f54954f9: Merge "bug fix possible NPE while startProcessLocked()"
* commit '8abe01aa80a0697d21103322ac500dce31058b50':
  bug fix possible NPE while startProcessLocked()
2014-12-02 18:19:45 +00:00
Junda Liu
ef6178a99c Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-dev 2014-12-02 18:18:24 +00:00
Craig Mautner
2d223d4e93 am b361f48b: am ca017a38: am 50f513c5: Merge "[ActivityManager] Invalidate last screenshot when activity relaunched"
* commit 'b361f48b38f89c029a4ea5548d876f34fd74a7fc':
  [ActivityManager] Invalidate last screenshot when activity relaunched
2014-12-02 18:11:59 +00:00
Craig Mautner
8abe01aa80 am a370d9d1: am f54954f9: Merge "bug fix possible NPE while startProcessLocked()"
* commit 'a370d9d19af04c2a9f9d5c5b5794a6a5cd6fd774':
  bug fix possible NPE while startProcessLocked()
2014-12-02 18:11:25 +00:00
Craig Mautner
b361f48b38 am ca017a38: am 50f513c5: Merge "[ActivityManager] Invalidate last screenshot when activity relaunched"
* commit 'ca017a38c9eb12fe92d24a72ad3ee4c33b00e5de':
  [ActivityManager] Invalidate last screenshot when activity relaunched
2014-12-02 18:04:10 +00:00
Craig Mautner
f54954f975 Merge "bug fix possible NPE while startProcessLocked()" 2014-12-02 17:57:14 +00:00
Christoph Studer
d3d9615db8 am bfecab14: am ef1073f7: am ff02faf8: Merge "NoMan: Optimize grouped notifications" into lmp-mr1-dev
* commit 'bfecab14f92067ee6104ab419bd8a4c7dcd5d03e':
  NoMan: Optimize grouped notifications
2014-12-02 15:59:18 +00:00
Christoph Studer
bfecab14f9 am ef1073f7: am ff02faf8: Merge "NoMan: Optimize grouped notifications" into lmp-mr1-dev
* commit 'ef1073f7b45873b5fb87d772c0a5036a2b274917':
  NoMan: Optimize grouped notifications
2014-12-02 15:52:20 +00:00
Christoph Studer
1f32c65697 NoMan/SysUI: Clear LEDs only when entering the shade
Don't clear notification LEDs when seeing notifications on the
lockscreen.

Also fix a bug where the LED didn't continue flashing after
the screen turned off.

For devices with doze capability, ensure that the LED continuing
to flash after screen off doesn't cause an immediate pulses, but
delay the first pulse by 10s.

Bug: 15449039
Change-Id: Id34d51a2c91ceaf069e49add1ab690bb855f9638
2014-12-02 16:52:13 +01:00
Christoph Studer
ef1073f7b4 am ff02faf8: Merge "NoMan: Optimize grouped notifications" into lmp-mr1-dev
* commit 'ff02faf8f3db791956a99ff0bb87eafb52f333d4':
  NoMan: Optimize grouped notifications
2014-12-02 15:45:01 +00:00
Christoph Studer
ff02faf8f3 Merge "NoMan: Optimize grouped notifications" into lmp-mr1-dev 2014-12-02 15:40:10 +00:00
Dongwon Kang
0e7a556844 am b076324c: am 3599af39: am 7cfe00f6: Merge "TIF: fix a race condition when TvInputManager is initialized" into lmp-mr1-dev
* commit 'b076324c64060161e75c35f43c688f7cf067e396':
  TIF: fix a race condition when TvInputManager is initialized
2014-12-02 07:42:50 +00:00
Dongwon Kang
b076324c64 am 3599af39: am 7cfe00f6: Merge "TIF: fix a race condition when TvInputManager is initialized" into lmp-mr1-dev
* commit '3599af39e45af0498daa4873216a8cf4d6fe67f9':
  TIF: fix a race condition when TvInputManager is initialized
2014-12-02 07:36:05 +00:00
Dongwon Kang
3599af39e4 am 7cfe00f6: Merge "TIF: fix a race condition when TvInputManager is initialized" into lmp-mr1-dev
* commit '7cfe00f69380573e9c989bbbc614930c279f2291':
  TIF: fix a race condition when TvInputManager is initialized
2014-12-02 07:29:10 +00:00
Dongwon Kang
7cfe00f693 Merge "TIF: fix a race condition when TvInputManager is initialized" into lmp-mr1-dev 2014-12-02 07:26:07 +00:00
Lorenzo Colitti
f89d840c87 am 5d1aeef0: am 28ca40ff: am 32f3518d: Merge "Only use mDefaultDns if the network claims to offer Internet" into lmp-mr1-dev
* commit '5d1aeef0e98e93fd3031522a61d53b1786e7effb':
  Only use mDefaultDns if the network claims to offer Internet
2014-12-02 07:07:41 +00:00
Lorenzo Colitti
5d1aeef0e9 am 28ca40ff: am 32f3518d: Merge "Only use mDefaultDns if the network claims to offer Internet" into lmp-mr1-dev
* commit '28ca40ff78dc5e62d0e26e7340b74ad6e5ba767e':
  Only use mDefaultDns if the network claims to offer Internet
2014-12-02 07:00:45 +00:00
Lorenzo Colitti
28ca40ff78 am 32f3518d: Merge "Only use mDefaultDns if the network claims to offer Internet" into lmp-mr1-dev
* commit '32f3518dccf5c599c21b54095abe561f48277898':
  Only use mDefaultDns if the network claims to offer Internet
2014-12-02 06:53:53 +00:00
Lorenzo Colitti
32f3518dcc Merge "Only use mDefaultDns if the network claims to offer Internet" into lmp-mr1-dev 2014-12-02 06:47:52 +00:00
louis_chang
3d9c431ca4 [ActivityManager] Invalidate last screenshot when activity relaunched
Symptom:
The task thumbnail is not updated when activity relaunched.

Reproduce Steps:
1. Put device in portrait
2. Launch Calculator
3. Launch Recent App (the Calculator's screenshot is correct)
4. Rotate device to landscape
5. Click Calculator in Recent App to return to Calculator (Calculator has relaunched to landsacpe ui)
6. Launch Recent App again (the Calculator's screenshot is not updated)

Change-Id: I92e951ea2ee215c52ca6e50cf6f9e02deb787bce
2014-12-02 12:38:05 +08:00
younghwan1.kim
8f6fc81500 bug fix possible NPE while startProcessLocked()
In case, process doesn't create well while startingProcessLocked().
There is possibility to make NPE.
Setting app's crash handler needs to be assigned after null check routine.

Change-Id: I67fb6427f72d93f79fed36eb44c47d37eafdac31
2014-12-02 13:04:40 +09:00
Jeff Sharkey
b6e0c6301d am db6753cf: am a8d0a3ae: am 2705387d: Merge "Include splits in dumpsys package output." into lmp-mr1-dev
* commit 'db6753cf2d8994edcc3e9e488a6be4e2f8ca397a':
  Include splits in dumpsys package output.
2014-12-02 01:25:34 +00:00
Jeff Sharkey
db6753cf2d am a8d0a3ae: am 2705387d: Merge "Include splits in dumpsys package output." into lmp-mr1-dev
* commit 'a8d0a3ae602bb455e290ca1ee6f18184c30f8dc7':
  Include splits in dumpsys package output.
2014-12-02 00:51:28 +00:00
Jeff Sharkey
a8d0a3ae60 am 2705387d: Merge "Include splits in dumpsys package output." into lmp-mr1-dev
* commit '2705387df6f3ffe87b2a3a71a48eea7e2be44fb1':
  Include splits in dumpsys package output.
2014-12-02 00:45:44 +00:00
Jeff Sharkey
2705387df6 Merge "Include splits in dumpsys package output." into lmp-mr1-dev 2014-12-02 00:39:48 +00:00
Christopher Tate
0832667b4e am dac93ba2: am 4bdf266c: am c70fc4a3: Merge "Don\'t crash if a system restore fails before constructing the PMBA" into lmp-mr1-dev
* commit 'dac93ba27e655d01a00cf15320e9f6bfe6fc1c82':
  Don't crash if a system restore fails before constructing the PMBA
2014-12-02 00:36:04 +00:00
Jeff Sharkey
c4d05fc0db Include splits in dumpsys package output.
Describe the currently installed splits, both in normal dumpsys
output and in checkin output.  Also include revisionCode of those
splits when defined (non-zero).

Bug: 18576300
Change-Id: Ie8140961fb7b9e0ed23fd6bc267157aab075dd78
2014-12-01 16:35:20 -08:00
Dongwon Kang
993f81e238 TIF: fix a race condition when TvInputManager is initialized
Currently, TvInputManagerService notifies the initial state of each
input via TvInputManagetCallback#onInputStateChanged after TvInputManager
is created. However, this is racy because the client may call methods
like getTvInputState() before the initialization.

This patch makes sure that the client gets the control when the initialization
finishes completely.

Bug: 18419452
Change-Id: I5d8141c20984013e68f2809120710c670557c9ad
2014-12-02 09:30:57 +09:00
Christopher Tate
dac93ba27e am 4bdf266c: am c70fc4a3: Merge "Don\'t crash if a system restore fails before constructing the PMBA" into lmp-mr1-dev
* commit '4bdf266c03d92448ae65ec31355588d17d179a98':
  Don't crash if a system restore fails before constructing the PMBA
2014-12-02 00:30:40 +00:00
Christopher Tate
4bdf266c03 am c70fc4a3: Merge "Don\'t crash if a system restore fails before constructing the PMBA" into lmp-mr1-dev
* commit 'c70fc4a32016f3f06aa80596a7d9b4e9614e78bc':
  Don't crash if a system restore fails before constructing the PMBA
2014-12-02 00:24:03 +00:00
Christopher Tate
c70fc4a320 Merge "Don't crash if a system restore fails before constructing the PMBA" into lmp-mr1-dev 2014-12-02 00:18:44 +00:00
dcashman
6ec2cbd8d2 am c25cfc57: am 24d02652: Merge "Prevent EntropyMixer from registering with service manager."
* commit 'c25cfc57e0d863b002620f5e7dd14822418c678f':
  Prevent EntropyMixer from registering with service manager.
2014-12-01 23:59:50 +00:00
Yuncheol Heo
b557195c5d am 96af2bd7: am 1d22f99d: am f1702487: CEC: make it sure to send vendor commands when changing a setting.
* commit '96af2bd77a9bf80799d681bfd05351df04ee69f4':
  CEC: make it sure to send vendor commands when changing a setting.
2014-12-01 23:51:38 +00:00
dcashman
24d02652bf Merge "Prevent EntropyMixer from registering with service manager." 2014-12-01 23:49:26 +00:00
Yuncheol Heo
96af2bd77a am 1d22f99d: am f1702487: CEC: make it sure to send vendor commands when changing a setting.
* commit '1d22f99da94f131c8047870a8c090b39630f5069':
  CEC: make it sure to send vendor commands when changing a setting.
2014-12-01 23:45:07 +00:00
Yuncheol Heo
1d22f99da9 am f1702487: CEC: make it sure to send vendor commands when changing a setting.
* commit 'f17024873b10dabed069e502030dd85d6257c0c4':
  CEC: make it sure to send vendor commands when changing a setting.
2014-12-01 23:39:17 +00:00
Yuncheol Heo
f17024873b CEC: make it sure to send vendor commands when changing a setting.
- Remove 'oneway' from IHdmiVendorCommandListener.
- Add flush() method to HdmiCecController.
- Use IoThread for HdmiCecController.

Bug: 18495592
Change-Id: I497f7b49e94dd4402058ecc89cb5b7a3d58bf1e1
2014-12-02 07:52:16 +09:00
Christopher Tate
a7e47d5d34 Don't crash if a system restore fails before constructing the PMBA
If a whole-system restore operation failed at just the wrong point,
we'd wind up in the teardown code without a certain vital bit of it
having been initialized, and crash on the null pointer.  Now we
recognize this failure mode and make sure not to do that.

Bug 18574450

Change-Id: Ifa2c10ce16bb3c6bc916ed7151c5fd51b7225691
2014-12-01 14:37:28 -08:00