OSDN Git Service
Android Build Merger (Role) [Tue, 30 Aug 2016 17:44:48 +0000 (17:44 +0000)]
Merge "Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev am:
5d628b1e45 am:
3a25ff9402" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 30 Aug 2016 17:44:35 +0000 (17:44 +0000)]
Merge "Enforce consistent sizes for arrays in SpannableStringInternal am:
9cde7244b6 am:
75152d61b0" into nyc-mr1-dev
Eino-Ville Talvala [Tue, 30 Aug 2016 17:44:08 +0000 (17:44 +0000)]
Merge "android.view.Surface: Add parceling warning" into nyc-mr1-dev
Raph Levien [Tue, 30 Aug 2016 17:44:09 +0000 (17:44 +0000)]
Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev am:
5d628b1e45
am:
3a25ff9402
Change-Id: I8d4783f155334b5c681765b12b0f59c3e30a8bd5
Raph Levien [Tue, 30 Aug 2016 17:44:04 +0000 (17:44 +0000)]
Enforce consistent sizes for arrays in SpannableStringInternal am:
9cde7244b6
am:
75152d61b0
Change-Id: I7b82b8367671de55fb0e1000869704dbbec843e4
Raph Levien [Tue, 30 Aug 2016 17:33:35 +0000 (17:33 +0000)]
Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev
am:
5d628b1e45
Change-Id: I4a2b24becdda847b7cf301d7224c218a1fab7dc7
Raph Levien [Tue, 30 Aug 2016 17:33:33 +0000 (17:33 +0000)]
Enforce consistent sizes for arrays in SpannableStringInternal
am:
9cde7244b6
Change-Id: I461863c5a4dad8f050b14f55d14020ab1a0874f7
Raph Levien [Tue, 30 Aug 2016 17:25:55 +0000 (17:25 +0000)]
Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev
Lorenzo Colitti [Tue, 30 Aug 2016 10:51:21 +0000 (10:51 +0000)]
Merge "Don't notify on network switch if source network is validated." into nyc-dr1-dev
am:
f45f9d31d3
Change-Id: Ic6ab6d1048a89c12b44c6c33e77c8ead7f641575
Lorenzo Colitti [Tue, 30 Aug 2016 10:51:19 +0000 (10:51 +0000)]
Don't notify on network switch if source network is validated.
am:
c2e10bb074
Change-Id: I85fdb0faf48a54ab63b5b23f1e992bc5e9116194
TreeHugger Robot [Tue, 30 Aug 2016 10:46:30 +0000 (10:46 +0000)]
Merge "Don't notify on network switch if source network is validated." into nyc-dr1-dev
TreeHugger Robot [Tue, 30 Aug 2016 07:09:28 +0000 (07:09 +0000)]
Merge "Remove INetd AIDL reference" into nyc-mr1-dev
Paul Jensen [Tue, 30 Aug 2016 05:47:36 +0000 (05:47 +0000)]
Merge "Sanity check ICMP6 router advertisement packets" into nyc-dev am:
b9d4f91630
am:
79ecffe719
Change-Id: I0a347072ac9dc32013b41209ba6966d6ff4d26a2
Paul Jensen [Tue, 30 Aug 2016 05:47:33 +0000 (05:47 +0000)]
Sanity check ICMP6 router advertisement packets am:
a36213867a -s ours
am:
e39980689e
Change-Id: I2a18188cb1b8a1c3fe26c41eea72f4c3cc03a369
Paul Jensen [Tue, 30 Aug 2016 05:44:34 +0000 (05:44 +0000)]
Merge "Sanity check ICMP6 router advertisement packets" into nyc-dev
am:
b9d4f91630
Change-Id: Ibea7e0328b1f7c74bf2edcc054cad2a54def905b
Paul Jensen [Tue, 30 Aug 2016 05:42:04 +0000 (05:42 +0000)]
Sanity check ICMP6 router advertisement packets
am:
a36213867a -s ours
Change-Id: I8371809758391158effb378fae4b6fc9aaca553c
TreeHugger Robot [Tue, 30 Aug 2016 05:20:10 +0000 (05:20 +0000)]
Merge "Sanity check ICMP6 router advertisement packets" into nyc-dev
Pat Tjin [Tue, 30 Aug 2016 05:18:33 +0000 (05:18 +0000)]
Merge "BootReceiver: Report correct headers for last messages" into nyc-mr1-dev
Erik Kline [Tue, 30 Aug 2016 02:40:20 +0000 (11:40 +0900)]
Remove INetd AIDL reference
Change-Id: I29dfee480a4706213b36766724b6211dbc74dbac
Todd Kennedy [Tue, 30 Aug 2016 01:57:48 +0000 (01:57 +0000)]
Merge "update shared libraries for system apps" into nyc-dev am:
689c92db9d
am:
69b47a2010
Change-Id: I73da3e3a7ffe88f69e9af28d65e5d695ffc1a1bb
Todd Kennedy [Tue, 30 Aug 2016 01:57:46 +0000 (01:57 +0000)]
update shared libraries for system apps am:
85a91def5c
am:
7c23d3f837
Change-Id: Idcd5040fbabafb79a7f847514d7d808a336109a9
Paul Jensen [Wed, 20 Jul 2016 19:01:17 +0000 (15:01 -0400)]
Sanity check ICMP6 router advertisement packets
There is a chance a packet can slip by before we install the filter
on our socket listening for RAs, so add some basic sanity checking
to make sure we've recieved an RA.
Change-Id: I14cf84a0814896a41e00f50af376dfc4988d36cb
Fixes:
29586253
Todd Kennedy [Tue, 30 Aug 2016 01:48:47 +0000 (01:48 +0000)]
Merge "update shared libraries for system apps" into nyc-dev
am:
689c92db9d
Change-Id: Iea85964ca4ee5557599858572864b51ea7dd53f3
Todd Kennedy [Tue, 30 Aug 2016 01:48:45 +0000 (01:48 +0000)]
update shared libraries for system apps
am:
85a91def5c
Change-Id: Iea6f0e3809bc5e4c77a1d5d83be67d6c285bea65
TreeHugger Robot [Tue, 30 Aug 2016 01:44:29 +0000 (01:44 +0000)]
Merge "update shared libraries for system apps" into nyc-dev
Eino-Ville Talvala [Tue, 30 Aug 2016 00:51:23 +0000 (17:51 -0700)]
android.view.Surface: Add parceling warning
Surface is parcelled partly in java, partly in native, and any fields
added in java have to be accounted for in the native side as well.
Add a warning to avoid issues in the future
Bug:
31162160
Change-Id: I48ca1bc3eea29f1ac3d3065f6defb6ed2be4052a
TreeHugger Robot [Tue, 30 Aug 2016 00:20:36 +0000 (00:20 +0000)]
Merge "Add animation when unoccluding windows (1/2)" into nyc-mr1-dev
John Reck [Mon, 29 Aug 2016 23:53:24 +0000 (23:53 +0000)]
Merge "Cherry pick TextureView fixes" into nyc-dev am:
8eaa65b867
am:
25c6b37613
Change-Id: I36308a0b1beb391a31fdad836ec6194cb048de4e
Chris Craik [Mon, 29 Aug 2016 23:53:22 +0000 (23:53 +0000)]
Cherry pick TextureView fixes am:
2e8a8a2432
am:
05cb60846c
Change-Id: I63d23f6b28b40154952cee408e42115657e6a3e3
John Reck [Mon, 29 Aug 2016 23:41:44 +0000 (23:41 +0000)]
Merge "Cherry pick TextureView fixes" into nyc-dev
am:
8eaa65b867
Change-Id: Iaf8ab16f6a1421ff6a19bf81a54b82111f6747f4
Chris Craik [Mon, 29 Aug 2016 23:41:42 +0000 (23:41 +0000)]
Cherry pick TextureView fixes
am:
2e8a8a2432
Change-Id: I1ae3cdc7181e9bef40e38204ede002de973dee98
Pankaj Kanwar [Mon, 29 Aug 2016 23:35:10 +0000 (23:35 +0000)]
Merge "Allow getResponseCode to block if response hasn't been received from remote" into nyc-mr1-dev
John Reck [Mon, 29 Aug 2016 23:33:55 +0000 (23:33 +0000)]
Merge "Cherry pick TextureView fixes" into nyc-dev
TreeHugger Robot [Mon, 29 Aug 2016 23:14:24 +0000 (23:14 +0000)]
Merge "Hold no locks when calling RemotePrintSpooler" into nyc-mr1-dev
Yohei Yukawa [Mon, 29 Aug 2016 23:00:05 +0000 (23:00 +0000)]
Merge "Make sure IME focus is synced to View focus" into nyc-dev am:
b7efddfc41
am:
15946bd93c
Change-Id: I79f4308a0f41ce510b63b439772b882110440d0f
Yohei Yukawa [Mon, 29 Aug 2016 23:00:02 +0000 (23:00 +0000)]
Make sure IME focus is synced to View focus am:
8eb07090a4 -s ours
am:
ef53c0f5ec
Change-Id: I32ffddff7dd3b82c735911c1f4de6830c783e830
TreeHugger Robot [Mon, 29 Aug 2016 22:55:25 +0000 (22:55 +0000)]
Merge "Push delete notification when Bug reports are deleted." into nyc-mr1-dev
Todd Kennedy [Thu, 28 Jul 2016 20:28:16 +0000 (13:28 -0700)]
update shared libraries for system apps
After removing updates for a system package, we weren't updating its
shared libraries when we should have. Make it so.
NOTE: This didn't affect device boot because we update all of the
shared libraries for all system applications after scanning packages.
Bug:
30266503
Change-Id: I8edf4344228fb3e793e7648ea70a041cb5db6af6
(cherry picked from commit
6058df65e645a81bdc7285dcd9f8b12b9f5b534f)
Yohei Yukawa [Mon, 29 Aug 2016 22:49:24 +0000 (22:49 +0000)]
Merge "Make sure IME focus is synced to View focus" into nyc-dev
am:
b7efddfc41
Change-Id: I6a5c98b87dffb4cd3db5e434743b463142a50e1d
Yohei Yukawa [Mon, 29 Aug 2016 22:45:50 +0000 (22:45 +0000)]
Make sure IME focus is synced to View focus
am:
8eb07090a4 -s ours
Change-Id: I32b177a7ea77566ed7b2f1808398b70c64bb756d
Chet Haase [Mon, 29 Aug 2016 22:43:58 +0000 (22:43 +0000)]
Merge "ChooserActivity: Cannot start app that the icon overflows the layout" into nyc-dev am:
59fb472858
am:
6a8b5585aa
Change-Id: I0142ece58fb6e7029df4ef1345100d364a440022
Yuichi Biwa [Mon, 29 Aug 2016 22:43:56 +0000 (22:43 +0000)]
ChooserActivity: Cannot start app that the icon overflows the layout am:
cb3e1237b5
am:
96ecd77dc8
Change-Id: Ic03480ad585a21c11b57090e1e1c81fc42e446d7
Chet Haase [Mon, 29 Aug 2016 22:43:53 +0000 (22:43 +0000)]
Merge "Set up view state before attaching, jump drawables if needed" into nyc-dev am:
22e006214c
am:
26849eca9c
Change-Id: Ie35d0812808f9ffae24657ad54f4780f9a237f2f
Alan Viverette [Mon, 29 Aug 2016 22:40:34 +0000 (22:40 +0000)]
Set up view state before attaching, jump drawables if needed am:
c328f042a6 -s ours
am:
54e7cbe563
Change-Id: Ic153d5df90cd74ba7b0fc8b1a3c3e7af06e7f7f9
Chet Haase [Mon, 29 Aug 2016 22:40:31 +0000 (22:40 +0000)]
Merge "Force AlertDialogLayout to have gravity start|top" into nyc-dev am:
a1bbb76806
am:
373f7c04fd
Change-Id: I031361a3be5aa73b9208cc93189013a68084ce53
Adam Powell [Mon, 29 Aug 2016 22:40:28 +0000 (22:40 +0000)]
Force AlertDialogLayout to have gravity start|top am:
00c4f7ba65
am:
96bdf5ca7b
Change-Id: Ib0579121436fe955091704f62429e1ebfb2ef7bd
Chet Haase [Mon, 29 Aug 2016 22:40:25 +0000 (22:40 +0000)]
Merge "FloatingActionMode: Fix screen coordinates." into nyc-dev am:
c80a4d7ae3
am:
6ff5fafeca
Change-Id: Ibb300e7a0f86c3db1c9909d710c928daefcff519
Abodunrinwa Toki [Mon, 29 Aug 2016 22:40:22 +0000 (22:40 +0000)]
FloatingActionMode: Fix screen coordinates. am:
99c340cad9
am:
cba50af05e
Change-Id: I6fd86900a22b3eac2750786a34782a0d39bd6d88
Ajay Panicker [Tue, 9 Aug 2016 00:16:50 +0000 (17:16 -0700)]
Allow getResponseCode to block if response hasn't been received from remote
Bug:
30645605
Change-Id: I9854ccbe98ace6d5490cb99586ca36379f5a1db1
TreeHugger Robot [Mon, 29 Aug 2016 22:35:21 +0000 (22:35 +0000)]
Merge "Make sure IME focus is synced to View focus" into nyc-dev
Chet Haase [Mon, 29 Aug 2016 22:31:37 +0000 (22:31 +0000)]
Merge "ChooserActivity: Cannot start app that the icon overflows the layout" into nyc-dev
am:
59fb472858
Change-Id: I68cef7811c79e264c685fcaae30b501d29789af5
Yuichi Biwa [Mon, 29 Aug 2016 22:31:33 +0000 (22:31 +0000)]
ChooserActivity: Cannot start app that the icon overflows the layout
am:
cb3e1237b5
Change-Id: I93bb2ff3a13f31f6ce6d2ab7161eba3f1be17999
Chet Haase [Mon, 29 Aug 2016 22:31:28 +0000 (22:31 +0000)]
Merge "Set up view state before attaching, jump drawables if needed" into nyc-dev
am:
22e006214c
Change-Id: Ib19c9f7c09574796d8446f2195323d78aa6b8811
Alan Viverette [Mon, 29 Aug 2016 22:31:24 +0000 (22:31 +0000)]
Set up view state before attaching, jump drawables if needed
am:
c328f042a6 -s ours
Change-Id: If8eeea4957a19389c9fea47bd0b31dbcc5d51b21
Chet Haase [Mon, 29 Aug 2016 22:31:20 +0000 (22:31 +0000)]
Merge "Force AlertDialogLayout to have gravity start|top" into nyc-dev
am:
a1bbb76806
Change-Id: I1f1d1efab0844204df403fdc7619b6c6d8b1fb77
Adam Powell [Mon, 29 Aug 2016 22:31:16 +0000 (22:31 +0000)]
Force AlertDialogLayout to have gravity start|top
am:
00c4f7ba65
Change-Id: If329f03f0475cb0b65ed62d97ee97285f8d24038
Chet Haase [Mon, 29 Aug 2016 22:31:09 +0000 (22:31 +0000)]
Merge "FloatingActionMode: Fix screen coordinates." into nyc-dev
am:
c80a4d7ae3
Change-Id: I39589f091b9f34581f20323e721a3d1ab2887c32
Abodunrinwa Toki [Mon, 29 Aug 2016 22:31:04 +0000 (22:31 +0000)]
FloatingActionMode: Fix screen coordinates.
am:
99c340cad9
Change-Id: If69592a88c5296d1321a08d78231492efaac6645
Chet Haase [Mon, 29 Aug 2016 22:13:09 +0000 (22:13 +0000)]
Merge "ChooserActivity: Cannot start app that the icon overflows the layout" into nyc-dev
Chet Haase [Mon, 29 Aug 2016 22:12:07 +0000 (22:12 +0000)]
Merge "Set up view state before attaching, jump drawables if needed" into nyc-dev
Chet Haase [Mon, 29 Aug 2016 22:11:25 +0000 (22:11 +0000)]
Merge "Force AlertDialogLayout to have gravity start|top" into nyc-dev
Chet Haase [Mon, 29 Aug 2016 22:11:07 +0000 (22:11 +0000)]
Merge "FloatingActionMode: Fix screen coordinates." into nyc-dev
Christopher Tate [Mon, 29 Aug 2016 22:02:29 +0000 (22:02 +0000)]
Merge "Eliminate next-alarm-clock broadcast flapping" into nyc-dev am:
2bbfe98062
am:
e9ca3ec441
Change-Id: I1b378ebf26f1be3699a529b7bc301d9cc559f3f2
Christopher Tate [Mon, 29 Aug 2016 22:02:25 +0000 (22:02 +0000)]
Eliminate next-alarm-clock broadcast flapping am:
c60da1edc1
am:
ef05b70110
Change-Id: Iafc27e38c3831edcfb048722d1b3a43b0cdca72e
TreeHugger Robot [Mon, 29 Aug 2016 21:57:15 +0000 (21:57 +0000)]
Merge "Size print destination to support font sizing" into nyc-mr1-dev
Christopher Tate [Mon, 29 Aug 2016 21:55:38 +0000 (21:55 +0000)]
Merge "Eliminate next-alarm-clock broadcast flapping" into nyc-dev
am:
2bbfe98062
Change-Id: I05c5b636f7edec76ab85c4e9b9d248c41acb4157
Christopher Tate [Mon, 29 Aug 2016 21:55:30 +0000 (21:55 +0000)]
Eliminate next-alarm-clock broadcast flapping
am:
c60da1edc1
Change-Id: Id45dadd7ccebf91435e197f86f5fba71127c0986
TreeHugger Robot [Mon, 29 Aug 2016 21:47:02 +0000 (21:47 +0000)]
Merge "Eliminate next-alarm-clock broadcast flapping" into nyc-dev
Pankaj Kanwar [Mon, 29 Aug 2016 21:45:07 +0000 (21:45 +0000)]
Merge "Update InCallService#onConnectionEvent comments." into nyc-dr1-dev
am:
d5b8c80b51
Change-Id: I0381077c87e1c42594c4cae902f479c891f56ede
Tyler Gunn [Mon, 29 Aug 2016 21:45:04 +0000 (21:45 +0000)]
Update InCallService#onConnectionEvent comments.
am:
06f3fa66b7
Change-Id: I954dd7bd3079f33e5966a1998c4f676c98cbe0de
Pankaj Kanwar [Mon, 29 Aug 2016 21:37:39 +0000 (21:37 +0000)]
Merge "Update InCallService#onConnectionEvent comments." into nyc-dr1-dev
Philip P. Moltmann [Wed, 24 Aug 2016 16:27:46 +0000 (09:27 -0700)]
Hold no locks when calling RemotePrintSpooler
The calls might be blocking and need the main thread of to be unblocked
to finish. Hence do not call while holding any monitors that might need
to be acquired the main thread.
The calls that have been moved out of the lock:
- Icon related calls: These are just caches. Hence we flush the cache we
just request the icon again
- Prune call: This just removes not installed print service from some
data structure. The order of two of these calls does not matter as
the end result of both removals will be the same, regardless of order.
Testing done: Reinstalled a print service multiple times. Before the
first reinstallation locked up the userState, now not anymore
Change-Id: I4f4cdaba65132dc2ef054877cbb097b499a723f6
Fixes:
31043684
Andrii Kulian [Mon, 29 Aug 2016 21:25:08 +0000 (21:25 +0000)]
Merge "DO NOT MERGE -- Fix finishing activity in non-focused stack" into nyc-dev am:
c8417676ed
am:
2f1662f524
Change-Id: I09187196f27c75e29de028cc7c344bffb5e0bd86
Andrii Kulian [Mon, 29 Aug 2016 21:25:05 +0000 (21:25 +0000)]
DO NOT MERGE -- Fix finishing activity in non-focused stack am:
772c598f66
am:
35c3c8ee8d
Change-Id: I715699d15b312c5164d87827eb5a29e330f6f4d5
Chris Craik [Mon, 25 Jul 2016 22:29:59 +0000 (15:29 -0700)]
Cherry pick TextureView fixes
The following changes are in this commit:
Avoid destroying TextureView surfaces for onStop
bug:
30238922
TextureViews will hold onto their backing surfaces, which will allow
them to resume gracefully when the app's surfaces are saved.
Now only resources that are destroyed for onStop are DisplayLists.
(cherry picked from commit
391d560402c2902e0fd701f99eabd91025154201)
TextureView: destroy layer on destroyHardwareResources event
bug:
30468770
(cherry picked from commit
1c16c37d8646ed25e844af8472eede988ad0c2f0)
Fix NPE in TextureView
Bug:
30651595
(cherry picked from commit
3c2587f26eed32a8723488131d1d8940dc147ee1)
Fix NPE in TextureView
Bug:
30779663
(cherry picked from commit
7e237189c292cdb886733eb95c6069b7ac002527)
Fix maps resume being blank
Bug:
30889568
Fixes an issue where mLayer didn't have
the mSurface set on it in certain resume
scenarios.
(cherry picked from commit
03df0834e63b587dbfb8fdcd0086e3e1e72b9f9d)
Andrii Kulian [Mon, 29 Aug 2016 21:17:02 +0000 (21:17 +0000)]
Merge "DO NOT MERGE -- Fix finishing activity in non-focused stack" into nyc-dev
am:
c8417676ed
Change-Id: I74e1b45ce3eaf9edec6fb60394da3ad8a818d214
Andrii Kulian [Mon, 29 Aug 2016 21:16:59 +0000 (21:16 +0000)]
DO NOT MERGE -- Fix finishing activity in non-focused stack
am:
772c598f66
Change-Id: I890f3b460787682bbe0fdb4d8ce44364f1839dac
Jorim Jaggi [Mon, 22 Aug 2016 20:08:44 +0000 (13:08 -0700)]
Add animation when unoccluding windows (1/2)
Before there was a jump-cut when a window that was occluding Keyguard
was going away, leading to an ugly flicker. To fix this, we do the
following.
- Always show windows with FLAG_SHOW_WHEN_LOCKED above lockscreen, even
if they don't "match" the currently occluding app (which is null in the
animation case)
- Move wallpaper behind last window that is not hidden by policy, so the
window doesn't get occluded by the wallpaper.
- Add a flag in the setOccluded call whether to animate or not. SystemUI
then plays a nice animation when it's set.
- Override the animation to always be the animation that happens when we
exit a window which is revealing the wallpaper behind, to make it
consistent with the home screen case.
Fixes:
30829255
Change-Id: Ib3fe20fc9003a0f9f291c974740f044ed8707e75
TreeHugger Robot [Mon, 29 Aug 2016 21:10:31 +0000 (21:10 +0000)]
Merge "DO NOT MERGE -- Fix finishing activity in non-focused stack" into nyc-dev
Ben Lin [Mon, 29 Aug 2016 21:07:06 +0000 (14:07 -0700)]
Push delete notification when Bug reports are deleted.
Bug:
28768706
Change-Id: I6d3e91fe7d12be44918f97cef12c99d936401270
TreeHugger Robot [Mon, 29 Aug 2016 19:51:29 +0000 (19:51 +0000)]
Merge "Fix flicker while booting" into nyc-mr1-dev
Tao Bao [Mon, 29 Aug 2016 19:48:29 +0000 (19:48 +0000)]
Bump up the uncrypt timeout to 30 min. am:
8abcfed8a4 am:
c5a17fc39f
am:
18f9533910
Change-Id: Ia41c67b41b9b89ac113f01e783edcbccae5a1cdc
Christopher Tate [Wed, 3 Aug 2016 21:57:47 +0000 (14:57 -0700)]
Eliminate next-alarm-clock broadcast flapping
When multiple alarm clocks are scheduled at the same time, we would
flap among the alternatives for considering them the 'next upcoming
alarm clock', which in turn would generate [many] spurious broadcasts
about changes to the upcoming alarm situation. This is now fixed;
once we have found the soonest upcoming alarm clock, we stick with
that one until it becomes unavailable, eliminating the spurious
broadcast traffic.
Bug
29501073
Change-Id: Ice1892490bb339e05fa8bd9d324fa1c6718b4942
(cherry picked from commit
76389c00d3d3ce79e48d9e87b597707ed3e8970c)
Tao Bao [Mon, 29 Aug 2016 19:34:23 +0000 (19:34 +0000)]
Bump up the uncrypt timeout to 30 min. am:
8abcfed8a4
am:
c5a17fc39f
Change-Id: Ib637e1f00ddebbac5a3bea6ff31f08854a95b7ea
Tao Bao [Mon, 29 Aug 2016 19:26:43 +0000 (19:26 +0000)]
Bump up the uncrypt timeout to 30 min.
am:
8abcfed8a4
Change-Id: I35340614fe09f96f8c31cc53a99e366580294490
Andrii Kulian [Mon, 29 Aug 2016 19:01:16 +0000 (19:01 +0000)]
Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev am:
128a4419e9
am:
934da4e400
Change-Id: I9b8c06e89ce182b4fb47a74aaea3d501267add84
Andrii Kulian [Mon, 29 Aug 2016 18:51:55 +0000 (18:51 +0000)]
Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev
am:
128a4419e9
Change-Id: I6c28db82c53af5a68c3d875ecca920b9a1364b32
Andrii Kulian [Mon, 29 Aug 2016 18:51:53 +0000 (18:51 +0000)]
DO NOT MERGE -- Correctly finish activity in non-focused stack am:
620040db3f -s ours
am:
febd5c027c
Change-Id: I658d45b3149128876240e41bbd16ad35951c6dfa
Andrii Kulian [Mon, 29 Aug 2016 18:44:11 +0000 (18:44 +0000)]
DO NOT MERGE -- Correctly finish activity in non-focused stack
am:
620040db3f -s ours
Change-Id: I62703cc7f62bf42967021ce8defa30669e096ec2
Jason Monk [Mon, 29 Aug 2016 18:32:39 +0000 (18:32 +0000)]
Merge "Fix double status bar icons" into nyc-dev am:
2b4e612b10
am:
db2d30e1b9
Change-Id: I707e1f8457e826d2d5b83ccc21668e5a786b28eb
Jason Monk [Mon, 29 Aug 2016 18:32:37 +0000 (18:32 +0000)]
Fix double status bar icons am:
12124d7eca
am:
447991c67a
Change-Id: Ic0a217f292dcf4a7d9b2b47c4d32438b436a77ad
Selim Cinek [Mon, 29 Aug 2016 18:32:35 +0000 (18:32 +0000)]
Merge "Fixed a bug where notifications could reappear" into nyc-dev am:
4226dcef1e
am:
c9c0bcf6a9
Change-Id: Ib517c495cd53a5ea0f14bb443b74d69d2efe8429
Selim Cinek [Mon, 29 Aug 2016 18:32:33 +0000 (18:32 +0000)]
Fixed a bug where notifications could reappear am:
f3b64692a3
am:
e90d6d682e
Change-Id: Ie08bd37033cd81ff0898a6766bd505e0f597d7fe
Selim Cinek [Mon, 29 Aug 2016 18:32:31 +0000 (18:32 +0000)]
Fixed a bug where the headsup would be stuck disappearing am:
a4155bb7c0
am:
c52edb4f24
Change-Id: I94084878dec7952607572d3005a160cc74eb2a62
Andrii Kulian [Fri, 29 Jul 2016 19:55:41 +0000 (12:55 -0700)]
DO NOT MERGE -- Fix finishing activity in non-focused stack
This CL explicitly checks if we're finishing activity in non-focused
stack as there are other cases except this one when we finish paused
activities in FINISH_AFTER_VISIBLE mode.
Bug:
29007436
Bug:
29458854
Change-Id: I67744d23cd72f2fe8861180008bfdd284a7b5e26
(cherry picked from commit
995fa2bd2d334a37e10760c21ac108f4a3595713)
Andrii Kulian [Mon, 29 Aug 2016 18:30:06 +0000 (18:30 +0000)]
Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev
Vineeta Srivastava [Mon, 29 Aug 2016 18:26:02 +0000 (18:26 +0000)]
Merge "whitelist sms code for TMO-DE and TMO-MK." into nyc-dr1-dev
am:
24b0486cdc
Change-Id: Id291ae046845660231be5b42473ef9b839055035
Jason Monk [Mon, 29 Aug 2016 18:26:00 +0000 (18:26 +0000)]
Merge "Fix double status bar icons" into nyc-dev
am:
2b4e612b10
Change-Id: Ib0d9e51d289215d96525b68d0432b959e9b58f2f
Vineeta Srivastava [Mon, 29 Aug 2016 18:26:00 +0000 (18:26 +0000)]
whitelist sms code for TMO-DE and TMO-MK.
am:
6af315af94
Change-Id: Ib31807ae28fa798e6d359054d70f9adeaf2872a4
Jason Monk [Mon, 29 Aug 2016 18:25:57 +0000 (18:25 +0000)]
Fix double status bar icons
am:
12124d7eca
Change-Id: Ief00496f19d2e249129023a03cd9f53d76fa7bf8