212916 Commits

Author SHA1 Message Date
Ian Pedowitz
87455c7397 Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev am: 966d6040c6 am: 95fc53b029
am: d6f3e38738

* commit 'd6f3e38738c88821b28b2571d034fc1b189a35de':
  Limit persistent ashmem backed fds to a minimum of 128kB.
2015-11-03 22:21:48 +00:00
Ian Pedowitz
d6f3e38738 Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev am: 966d6040c6
am: 95fc53b029

* commit '95fc53b0293a6361c7ff8a412897a869f07664c6':
  Limit persistent ashmem backed fds to a minimum of 128kB.
2015-11-03 22:13:54 +00:00
Ian Pedowitz
95fc53b029 Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev
am: 966d6040c6

* commit '966d6040c6b171c75e9fb0ca942e84f9cf4d0dff':
  Limit persistent ashmem backed fds to a minimum of 128kB.
2015-11-03 22:05:23 +00:00
Ian Pedowitz
966d6040c6 Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev 2015-11-03 21:58:30 +00:00
Glenn Kasten
ca2daddfea Merge commit 'd8a8500429' into new
Change-Id: I13e6c1d3a63e298ddebcc83a229fa497dd5eb129
2015-11-03 12:59:07 -08:00
Tenghui Zhu
0cda530e0e Merge "Use clang for libhwui" into mnc-dr-dev am: 61c93eb16d am: a66dc6e159
am: a32f221db0

* commit 'a32f221db0361c9047fd61373fbf815c37d958f8':
  Use clang for libhwui
2015-11-03 19:55:52 +00:00
Tenghui Zhu
a32f221db0 Merge "Use clang for libhwui" into mnc-dr-dev am: 61c93eb16d
am: a66dc6e159

* commit 'a66dc6e159bd8f4997a9253d5590807c02358d84':
  Use clang for libhwui
2015-11-03 19:49:20 +00:00
Ching Tzung Lin
7078a44687 Merge "Remove circular_display_mask_offset symbol and default" into cw-e-dev am: 7f54aa1e81
am: 9c7f6a409b

* commit '9c7f6a409b516328378aa9b882de16c4700c76c4':
  Remove circular_display_mask_offset symbol and default
2015-11-03 19:43:02 +00:00
Dianne Hackborn
3aee38c86e Merge "Fix issue #25357209: Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev am: 71e4984505 am: 9a13cc6992
am: a09ac2d998

* commit 'a09ac2d998fdc901fb65b57a061cc445922e081f':
  Fix issue #25357209: Could not send SMS or MMS messages, had to reboot
2015-11-03 19:40:43 +00:00
Tenghui Zhu
a66dc6e159 Merge "Use clang for libhwui" into mnc-dr-dev
am: 61c93eb16d

* commit '61c93eb16d91bd210948af6e812517e3c03535b4':
  Use clang for libhwui
2015-11-03 19:40:29 +00:00
Tenghui Zhu
61c93eb16d Merge "Use clang for libhwui" into mnc-dr-dev 2015-11-03 19:25:43 +00:00
Ching Tzung Lin
9c7f6a409b Merge "Remove circular_display_mask_offset symbol and default" into cw-e-dev
am: 7f54aa1e81

* commit '7f54aa1e814527371d54864bcbf9387553822ea7':
  Remove circular_display_mask_offset symbol and default
2015-11-03 19:03:48 +00:00
Ching Tzung Lin
7f54aa1e81 Merge "Remove circular_display_mask_offset symbol and default" into cw-e-dev 2015-11-03 18:39:40 +00:00
Chris Craik
d354fd2c66 Use clang for libhwui
bug:25417885

Change-Id: I0ef8034d79ba3682925e3c2a4b7ccd833fd4f156
2015-11-03 10:34:28 -08:00
Dianne Hackborn
a09ac2d998 Merge "Fix issue #25357209: Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev am: 71e4984505
am: 9a13cc6992

* commit '9a13cc69926c90fe75b624a9a781dc56706a6091':
  Fix issue #25357209: Could not send SMS or MMS messages, had to reboot
2015-11-03 18:33:57 +00:00
Dianne Hackborn
9a13cc6992 Merge "Fix issue #25357209: Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev
am: 71e4984505

* commit '71e49845054a3a7dacc51efc4fe658818caec048':
  Fix issue #25357209: Could not send SMS or MMS messages, had to reboot
2015-11-03 18:27:18 +00:00
Dianne Hackborn
71e4984505 Merge "Fix issue #25357209: Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev 2015-11-03 18:21:23 +00:00
Riley Andrews
8cee7c1711 Limit persistent ashmem backed fds to a minimum of 128kB.
Bug 25256717

Change-Id: Ieb356006df0a6545b89de44d3d8fd4b46312b3b8
Signed-off-by: Riley Andrews <riandrews@google.com>
2015-11-03 17:46:15 +00:00
Thierry Strudel
271dd1da81 Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev am: 1942be506e am: b1fe11fde4
am: 6efac0595f

* commit '6efac0595f4da7f8009aa5da26a5ca024bbb0e4f':
  NetworkTimeUpdateService: Grab a wakelock when manipulating system time
2015-11-03 06:51:38 +00:00
Thierry Strudel
6efac0595f Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev am: 1942be506e
am: b1fe11fde4

* commit 'b1fe11fde44b4ac56c48f91cd27ced7ac4b0469f':
  NetworkTimeUpdateService: Grab a wakelock when manipulating system time
2015-11-03 06:45:12 +00:00
Thierry Strudel
b1fe11fde4 Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev
am: 1942be506e

* commit '1942be506eb16589e3059fa62ea7b718440fb386':
  NetworkTimeUpdateService: Grab a wakelock when manipulating system time
2015-11-03 06:39:58 +00:00
Thierry Strudel
1942be506e Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev 2015-11-03 06:35:59 +00:00
Tyler Gunn
6ebf6a27a7 Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev am: 8b86c76296 am: 48a0c3ae8d
am: e0eaa03307

* commit 'e0eaa03307f2327080becffab3245e33d674a1fe':
  Improve comment on EXTRA_CALL_RAT_TYPE.
2015-11-03 04:59:44 +00:00
Tyler Gunn
e0eaa03307 Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev am: 8b86c76296
am: 48a0c3ae8d

* commit '48a0c3ae8dd0d3944a3cffa2bafec47f9bc346d6':
  Improve comment on EXTRA_CALL_RAT_TYPE.
2015-11-03 04:54:47 +00:00
Tyler Gunn
48a0c3ae8d Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev
am: 8b86c76296

* commit '8b86c7629676eeea490531b2a412873e0196eb6f':
  Improve comment on EXTRA_CALL_RAT_TYPE.
2015-11-03 04:49:33 +00:00
Tyler Gunn
8b86c76296 Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev 2015-11-03 04:44:53 +00:00
Sanket Padawe
535c6fbaa5 Merge "Fix a crash while printing ICCID because of alphabets in UICC." into mnc-dr-dev am: b57c65b00e am: 71f018a411
am: 391c87dea8

* commit '391c87dea8a66a03be07527e1fc15c659e6072d0':
  Fix a crash while printing ICCID because of alphabets in UICC.
2015-11-03 02:04:40 +00:00
Sanket Padawe
391c87dea8 Merge "Fix a crash while printing ICCID because of alphabets in UICC." into mnc-dr-dev am: b57c65b00e
am: 71f018a411

* commit '71f018a411c55383f395adc52d8363d6103529d3':
  Fix a crash while printing ICCID because of alphabets in UICC.
2015-11-03 01:58:05 +00:00
Sanket Padawe
71f018a411 Merge "Fix a crash while printing ICCID because of alphabets in UICC." into mnc-dr-dev
am: b57c65b00e

* commit 'b57c65b00efbcc6c8ed5a64b2c314dbca72d5554':
  Fix a crash while printing ICCID because of alphabets in UICC.
2015-11-03 01:52:13 +00:00
Sanket Padawe
b57c65b00e Merge "Fix a crash while printing ICCID because of alphabets in UICC." into mnc-dr-dev 2015-11-03 01:47:04 +00:00
Selim Cinek
e4fd7227eb Fixed a bug where the panel could get stuck closing am: b0e4f9e97e am: 157e60f7a2
am: 341d544693

* commit '341d544693c47ba9c5a60108e0ed4eabb9e2e069':
  Fixed a bug where the panel could get stuck closing
2015-11-03 01:34:31 +00:00
Selim Cinek
341d544693 Fixed a bug where the panel could get stuck closing am: b0e4f9e97e
am: 157e60f7a2

* commit '157e60f7a2ec40bdbb3bde0ea41f1c92bef93a1e':
  Fixed a bug where the panel could get stuck closing
2015-11-03 01:29:27 +00:00
Selim Cinek
157e60f7a2 Fixed a bug where the panel could get stuck closing
am: b0e4f9e97e

* commit 'b0e4f9e97e272783f08b2245219239aaa667073d':
  Fixed a bug where the panel could get stuck closing
2015-11-03 01:21:43 +00:00
Dianne Hackborn
fcc95a6d2c Fix issue #25357209: Could not send SMS or MMS messages, had to reboot
I think what probably happened is that since we only report an app
going in to the "interaction" state as an interaction event to usage
stats, apps that sit around in that state forever will only see one
interaction at the start and never again.  So usage stats could start
thinking they are idle.

Fix this by having the activity manager report an interaction event
for such long running applications at least once a day.

Also, because it is correct and for paranoia by protected us another
way, system uids should never go in to standby.

Change-Id: I8a3805bfca86cbe78560488a649ecd07427da99a
2015-11-02 16:15:35 -08:00
Sanket Padawe
f149dcb36e Fix a crash while printing ICCID because of alphabets in UICC.
Bug: 25401769
Change-Id: Ieda058817b8d3cb4b1696fd9932bd0f10da55573
2015-11-02 15:45:18 -08:00
Glenn Kasten
9418dca1dc Merge "MidiManager: fix double BTLE callback" am: bbf34d0bd1
am: 58f41c3b76

* commit '58f41c3b76b7b32c430d5dde799aeddc5034d88c':
  MidiManager: fix double BTLE callback
2015-11-02 23:10:11 +00:00
Glenn Kasten
1ec066b927 Merge "MidiService: update listener with current status when registered" am: d4e9b9e4ac
am: 350dc16475

* commit '350dc16475c6d64d2837ed19fa736fcdd423f61a':
  MidiService: update listener with current status when registered
2015-11-02 23:08:35 +00:00
Glenn Kasten
d8a8500429 Merge "MidiBluetoothService: add new device to HashMap"
am: 9b07ba4bc3

* commit '9b07ba4bc33319d6db8de173a24eb13b2d7f0b50':
  MidiBluetoothService: add new device to HashMap
2015-11-02 23:03:18 +00:00
Glenn Kasten
58f41c3b76 Merge "MidiManager: fix double BTLE callback"
am: bbf34d0bd1

* commit 'bbf34d0bd1bc4f85c9af614291925f5da1fa0459':
  MidiManager: fix double BTLE callback
2015-11-02 23:01:49 +00:00
Glenn Kasten
350dc16475 Merge "MidiService: update listener with current status when registered"
am: d4e9b9e4ac

* commit 'd4e9b9e4ac4196d37b0a5e59867f5a51018f4087':
  MidiService: update listener with current status when registered
2015-11-02 23:00:15 +00:00
Glenn Kasten
9b07ba4bc3 Merge "MidiBluetoothService: add new device to HashMap" 2015-11-02 22:51:12 +00:00
Glenn Kasten
bbf34d0bd1 Merge "MidiManager: fix double BTLE callback" 2015-11-02 22:51:02 +00:00
Glenn Kasten
d4e9b9e4ac Merge "MidiService: update listener with current status when registered" 2015-11-02 22:50:50 +00:00
Selim Cinek
b0e4f9e97e Fixed a bug where the panel could get stuck closing
When mClosing was set even though the panel was not
expanding, the variable was never reset leading to
bad states like the notification shade not updating,
people missing calls and similar bad bugs.

Bug: 25338991
Change-Id: I4362fda257770c98c5f9ba75a5622b14f74dc5ae
2015-11-02 21:51:34 +00:00
Ching Tzung Lin
f83d778e10 Remove circular_display_mask_offset symbol and default
Bug:25220421
Change-Id: I05c3bc3c54ee4aaefdfbb4963b8f656663ccee51
2015-11-02 13:39:51 -08:00
Phil Burk
2e48f1b96e MidiBluetoothService: add new device to HashMap
The HashMap is being used but devices never added to the map.

Bug: 23429459
Change-Id: I1da5305a56f5bd48e1c5d9345e721ea8dd2eed4e
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit e5f722e55c5708c2b48b8c9688c135e451225032)
2015-11-02 13:31:29 -08:00
Phil Burk
a471e2cf8c MidiManager: fix double BTLE callback
Stop openBluetoothDevice() from calling its callback twice.

Bug: 23218338
Change-Id: I2e738b22a124c0336c46bef05680a82ee1f59e79
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit 0ca998d79fe95ded26ec4ff0a1e0a8dc4802684b)
2015-11-02 13:31:29 -08:00
Phil Burk
3698fca0dc MidiService: update listener with current status when registered
This will give an app an opportunity to learn whether an input port is busy
before the user tries to connect and then fails.

Bug: 22825043
Change-Id: Ifede60f166dfe66ea15453044fce06f4a8452b18
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit b2355940e3e697deeecd1b6511cd5094f9dc553a)
2015-11-02 13:31:29 -08:00
Svetoslav Ganov
f2e81e904a Merge "Don\'t try overriding system fixed permissions on install" into mnc-dr-dev am: a47f9dad2b am: c4c1866228
am: 023f4d158d

* commit '023f4d158d96bb4237733db0a1e124eae499d7cc':
  Don't try overriding system fixed permissions on install
2015-11-02 21:18:22 +00:00
Svetoslav Ganov
023f4d158d Merge "Don\'t try overriding system fixed permissions on install" into mnc-dr-dev am: a47f9dad2b
am: c4c1866228

* commit 'c4c1866228a776758d71cf4d171a17fa01891d89':
  Don't try overriding system fixed permissions on install
2015-11-02 21:10:49 +00:00