sreevanis
a9486c041f
Merge "Wear 2.0 preview input method documentaation." into mnc-io-docs
...
am: 9c105c50a9
2016-05-13 23:12:28 +00:00
Chris Craik
0c5bd7dffe
Merge "Fix Skia filter behavior test" into nyc-dev
2016-05-13 23:12:18 +00:00
Sreevani Sreejith
9c105c50a9
Merge "Wear 2.0 preview input method documentaation." into mnc-io-docs
2016-05-13 23:04:51 +00:00
Jorim Jaggi
26c8c42bbb
Also freeze configuration when freezing bounds
...
We also need to freeze the override configuration so we don't report
the new configuration too early, which leads to bugs.
Bug: 27915587
Change-Id: Idffadbb02ab0311796caa760ae1f467fd2d17768
2016-05-13 16:00:50 -07:00
sreevanis
011bd6962c
Wear 2.0 preview input method documentaation.
...
Bug:28472831
Change-Id: Ic2143ec8087d084609e3c6e8c125c37e1a5849da
2016-05-13 15:55:24 -07:00
Chong Zhang
dcf0183cea
Set final crop on wallpaper instead of intersect clip with stack bounds
...
Wallpaper's clip rect is offset by its window offsets, it can't be
intersect directly with stack bounds.
bug: 28763785
Change-Id: Id87d668c9e59832498c9c62730617d0a5a9207c2
2016-05-13 15:42:58 -07:00
Ruchi Kandoi
fa97fcf7b9
network: Adds the functionality to parse uid in netlink messages.
...
Netlink notifications about the state of the modem contains uid too.
This patch adds the functionality to add that. It also fixes the bug to
parse the timestamp in the message even in cases where the length is
greater than expected.
Bug: 28527904
Change-Id: I4643bff3eb5b1ffa2dc0b78f1c6947d60487e0d8
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com >
2016-05-13 15:36:23 -07:00
Android Build Merger (Role)
f6ecb96a08
Merge "Merge "Make settings cahches generation mechanism robust." into nyc-dev am: b35301e421 am: 1ba77621c6" into nyc-mr1-dev-plus-aosp
2016-05-13 22:31:42 +00:00
Svetoslav Ganov
7f17ec8337
Merge "Make settings cahches generation mechanism robust." into nyc-dev am: b35301e421
...
am: 1ba77621c6
2016-05-13 22:31:20 +00:00
Android Build Merger (Role)
29014e1bae
Merge "Merge "Make settings cahches generation mechanism robust." into nyc-dev am: b35301e421 am: 1ba77621c6" into nyc-mr1-dev-plus-aosp
2016-05-13 22:29:32 +00:00
Svetoslav Ganov
c6ec78bbe8
Merge "Make settings cahches generation mechanism robust." into nyc-dev am: b35301e421
...
am: 1ba77621c6
2016-05-13 22:29:04 +00:00
Svetoslav Ganov
7cd6a970c0
Merge "Make settings cahches generation mechanism robust." into nyc-dev am: b35301e421
...
am: d361bbd0db
2016-05-13 22:29:02 +00:00
Svetoslav Ganov
d361bbd0db
Merge "Make settings cahches generation mechanism robust." into nyc-dev
...
am: b35301e421
2016-05-13 22:26:29 +00:00
Svetoslav Ganov
1ba77621c6
Merge "Make settings cahches generation mechanism robust." into nyc-dev
...
am: b35301e421
2016-05-13 22:26:27 +00:00
Svetoslav Ganov
b35301e421
Merge "Make settings cahches generation mechanism robust." into nyc-dev
2016-05-13 22:22:32 +00:00
Android Build Merger (Role)
0758c49182
Merge "docs: Updates to multi-window and related docs. am: 4d93a21980 am: 8263d6c0a3 am: c88130c572 am: d29c26073e am: f975b74c0c am: 93355f2943" into nyc-mr1-dev-plus-aosp
2016-05-13 22:14:17 +00:00
Svetoslav Ganov
04df738bcb
Make settings cahches generation mechanism robust.
...
Settings is using a MemoryIntArray to communicate the settings table
version enabling apps to have up-to-date local caches. However, ashmem
allows an arbitrary process with a handle to the fd (even in read only
mode) to unpin the memory which can then be garbage collected. Here we
make this mechanism fault tolerant against bad apps unpinning the ashmem
region. First, we no longer unpin the ashmem on the client side and if
the ashmem region is purged and cannot be pinned we recreate it and
hook up again with the local app caches. The change also adds a test
that clients can only read while owner can read/write.
bug:28764789
Change-Id: I1ef79b4b21e976124b268c9126a55d614157059b
2016-05-13 15:14:14 -07:00
Andrew Solovay
ece4937b8a
docs: Updates to multi-window and related docs. am: 4d93a21980 am: 8263d6c0a3 am: c88130c572 am: d29c26073e am: f975b74c0c
...
am: 93355f2943
2016-05-13 22:13:34 +00:00
Andrew Solovay
3882169d7f
docs: Updates to multi-window and related docs. am: 4d93a21980 am: 8263d6c0a3 am: c88130c572 am: d29c26073e am: f975b74c0c
...
am: 0b15a5c94f
2016-05-13 22:13:30 +00:00
Andrew Solovay
0b15a5c94f
docs: Updates to multi-window and related docs. am: 4d93a21980 am: 8263d6c0a3 am: c88130c572 am: d29c26073e
...
am: f975b74c0c
2016-05-13 22:10:49 +00:00
Andrew Solovay
93355f2943
docs: Updates to multi-window and related docs. am: 4d93a21980 am: 8263d6c0a3 am: c88130c572 am: d29c26073e
...
am: f975b74c0c
2016-05-13 22:10:47 +00:00
Andrew Solovay
f975b74c0c
docs: Updates to multi-window and related docs. am: 4d93a21980 am: 8263d6c0a3 am: c88130c572
...
am: d29c26073e
2016-05-13 22:08:17 +00:00
Android Build Merger (Role)
baa27d8051
Merge "Merge "Add Fragment#onAttachFragment for parent fragments" into nyc-dev am: a6c0cc0992 am: f1dda81c42" into nyc-mr1-dev-plus-aosp
2016-05-13 22:03:27 +00:00
Andrew Solovay
d29c26073e
docs: Updates to multi-window and related docs. am: 4d93a21980 am: 8263d6c0a3
...
am: c88130c572
2016-05-13 22:03:15 +00:00
Adam Powell
7ad7b6d726
Merge "Add Fragment#onAttachFragment for parent fragments" into nyc-dev am: a6c0cc0992
...
am: f1dda81c42
2016-05-13 22:03:06 +00:00
Android Build Merger (Role)
1fe7fae62c
Merge "Merge "Add Fragment#onAttachFragment for parent fragments" into nyc-dev am: a6c0cc0992 am: f1dda81c42" into nyc-mr1-dev-plus-aosp
2016-05-13 22:01:24 +00:00
Adam Powell
bbb2c35902
Merge "Add Fragment#onAttachFragment for parent fragments" into nyc-dev am: a6c0cc0992
...
am: 46ca7d8c28
2016-05-13 22:00:46 +00:00
Adam Powell
56d63ee6aa
Merge "Add Fragment#onAttachFragment for parent fragments" into nyc-dev am: a6c0cc0992
...
am: f1dda81c42
2016-05-13 22:00:45 +00:00
Andrew Solovay
c88130c572
docs: Updates to multi-window and related docs. am: 4d93a21980
...
am: 8263d6c0a3
2016-05-13 22:00:39 +00:00
Adam Powell
f1dda81c42
Merge "Add Fragment#onAttachFragment for parent fragments" into nyc-dev
...
am: a6c0cc0992
2016-05-13 21:57:57 +00:00
Adam Powell
46ca7d8c28
Merge "Add Fragment#onAttachFragment for parent fragments" into nyc-dev
...
am: a6c0cc0992
2016-05-13 21:57:52 +00:00
Andrew Solovay
8263d6c0a3
docs: Updates to multi-window and related docs.
...
am: 4d93a21980
2016-05-13 21:57:51 +00:00
TreeHugger Robot
a6c0cc0992
Merge "Add Fragment#onAttachFragment for parent fragments" into nyc-dev
2016-05-13 21:53:42 +00:00
Andrew Solovay
29c8607739
docs: Quick Tile update to DP3 release notes
...
Continuing work from CL http://ag/1010439 , addressing comments on
that CL that were left after it was submitted.
See first comment for doc stage location.
bug: 28588696
Change-Id: I9d92008ed30582657d97f162958b8efd5c317999
2016-05-13 14:51:20 -07:00
Dianne Hackborn
4502ce2d49
Fix issue #28728838 java.lang.ClassCastException: android.os.BinderProxy...
...
...cannot be cast to LocalBinder after a crash
Turns out, if you called removeProcessLocked() with an old ProcessRecord,
we could get in to a bad state -- if we had a new process with that same
name already running, we would kind-of blow it away as a process name,
but not as much else. So the next time we wanted to run a new thing
in the process, we would start a new second process and the two could
get mixed together.
Change-Id: I05e0463bd55f57f5e07f0b804ed9fd8c4f98a5a5
2016-05-13 14:50:23 -07:00
Android Build Merger (Role)
02cb7545f3
Merge "Merge "docs: Bridger feature page for Wear preview" into mnc-io-docs am: 1334929863 am: 2288757582 am: 1778b7cf07 am: 6ed49919ac" into nyc-mr1-dev-plus-aosp
2016-05-13 21:49:46 +00:00
Bert McMeen
31a1fd223b
Merge "docs: Bridger feature page for Wear preview" into mnc-io-docs am: 1334929863 am: 2288757582 am: 1778b7cf07
...
am: 6ed49919ac
2016-05-13 21:49:17 +00:00
Bert McMeen
0b52ba089a
Merge "docs: Bridger feature page for Wear preview" into mnc-io-docs am: 1334929863 am: 2288757582 am: 1778b7cf07
...
am: a358db1b4b
2016-05-13 21:48:54 +00:00
Bert McMeen
a358db1b4b
Merge "docs: Bridger feature page for Wear preview" into mnc-io-docs am: 1334929863 am: 2288757582
...
am: 1778b7cf07
2016-05-13 21:45:50 +00:00
Bert McMeen
6ed49919ac
Merge "docs: Bridger feature page for Wear preview" into mnc-io-docs am: 1334929863 am: 2288757582
...
am: 1778b7cf07
2016-05-13 21:45:45 +00:00
Android Build Merger (Role)
f60781df65
Merge "Merge "docs: Wear preview docs: Get Started, Download/Test, Program Overview" into mnc-io-docs am: e8d7012fba am: 97158b85ec am: 689826fba9 am: 8216496435" into nyc-mr1-dev-plus-aosp
2016-05-13 21:43:45 +00:00
Bert McMeen
894d6f5c58
Merge "docs: Wear preview docs: Get Started, Download/Test, Program Overview" into mnc-io-docs am: e8d7012fba am: 97158b85ec am: 689826fba9
...
am: 8216496435
2016-05-13 21:43:18 +00:00
Bert McMeen
1778b7cf07
Merge "docs: Bridger feature page for Wear preview" into mnc-io-docs am: 1334929863
...
am: 2288757582
2016-05-13 21:43:01 +00:00
Android Build Merger (Role)
9fe39fec53
Merge "Merge "docs: Wear preview docs: Get Started, Download/Test, Program Overview" into mnc-io-docs am: e8d7012fba am: 97158b85ec am: 689826fba9 am: 8216496435" into nyc-mr1-dev-plus-aosp
2016-05-13 21:41:13 +00:00
Android Build Merger (Role)
c83e3752d9
Merge "Merge "docs: Wear preview docs: Get Started, Download/Test, Program Overview" into mnc-io-docs am: e8d7012fba am: 97158b85ec am: 689826fba9 am: d04fa1ba87" into nyc-mr1-dev-plus-aosp
2016-05-13 21:41:09 +00:00
Android Build Merger (Role)
38805bad3b
Merge "docs: Complications guide for Wear Preview am: c0780f1d52 am: 194fbc0da4 am: ccbf8c5dde am: e97e3225f2" into nyc-mr1-dev-plus-aosp
2016-05-13 21:41:05 +00:00
Bert McMeen
fda03989ec
Merge "docs: Wear preview docs: Get Started, Download/Test, Program Overview" into mnc-io-docs am: e8d7012fba am: 97158b85ec am: 689826fba9
...
am: 8216496435
2016-05-13 21:40:37 +00:00
Bert McMeen
163bb677bf
Merge "docs: Wear preview docs: Get Started, Download/Test, Program Overview" into mnc-io-docs am: e8d7012fba am: 97158b85ec am: 689826fba9
...
am: d04fa1ba87
2016-05-13 21:40:32 +00:00
Bert McMeen
bc2cecf06e
docs: Complications guide for Wear Preview am: c0780f1d52 am: 194fbc0da4 am: ccbf8c5dde
...
am: e97e3225f2
2016-05-13 21:40:31 +00:00
Bert McMeen
bf5f76f995
docs: Complications guide for Wear Preview am: c0780f1d52 am: 194fbc0da4 am: ccbf8c5dde
...
am: 6870bd7b9e
2016-05-13 21:40:28 +00:00
