OSDN Git Service
Chris Craik [Mon, 29 Aug 2016 23:53:24 +0000 (23:53 +0000)]
Cherry pick TextureView fixes am:
2e8a8a2432
am:
dbf69818a2
Change-Id: Ia3924a4fa600611bbce966c327d563c67c5b4779
Chris Craik [Mon, 29 Aug 2016 23:41:22 +0000 (23:41 +0000)]
Cherry pick TextureView fixes
am:
2e8a8a2432
Change-Id: I0f650bf2647f9141f9639a4e8875170640d78237
Yohei Yukawa [Mon, 29 Aug 2016 23:00:57 +0000 (23:00 +0000)]
Merge "Make sure IME focus is synced to View focus" into nyc-dev am:
b7efddfc41
am:
438c37a1dc
Change-Id: I3394e8f297577b80e439945425356e8e7edac227
Yohei Yukawa [Mon, 29 Aug 2016 22:55:50 +0000 (22:55 +0000)]
Make sure IME focus is synced to View focus am:
8eb07090a4
am:
87b9a88c32 -s ours
Change-Id: If98a7d876f877e7bc1c87dbaac2a21ffeea988da
Chet Haase [Mon, 29 Aug 2016 22:40:45 +0000 (22:40 +0000)]
Merge "ChooserActivity: Cannot start app that the icon overflows the layout" into nyc-dev am:
59fb472858
am:
db7f35fed6
Change-Id: I9bb129067af7cc69f3e29c6d16742ff241c1c71e
Yuichi Biwa [Mon, 29 Aug 2016 22:40:42 +0000 (22:40 +0000)]
ChooserActivity: Cannot start app that the icon overflows the layout am:
cb3e1237b5
am:
98a824dbb7
Change-Id: Ic831e45c32ccf17d577381c63bf620cd9fedf275
Chet Haase [Mon, 29 Aug 2016 22:40:38 +0000 (22:40 +0000)]
Merge "Set up view state before attaching, jump drawables if needed" into nyc-dev am:
22e006214c
am:
c562501eb1
Change-Id: Ic838b6527d4b8e2b6bd16879d10c1ca1a2a000c8
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
am:
01ba422091 -s ours
Change-Id: I8a8659fdb5b28449d3e14846b1bfa5b23d5ba2d3
Yohei Yukawa [Mon, 29 Aug 2016 22:40:11 +0000 (22:40 +0000)]
Merge "Make sure IME focus is synced to View focus" into nyc-dev
am:
b7efddfc41
Change-Id: Icbef365e73d789419479143d9ce63a2476682b8e
Yohei Yukawa [Mon, 29 Aug 2016 22:40:07 +0000 (22:40 +0000)]
Make sure IME focus is synced to View focus
am:
8eb07090a4
Change-Id: Ia0db5adc86c72f122a5b9bab91962ffa2923469a
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:29:20 +0000 (22:29 +0000)]
Merge "Force AlertDialogLayout to have gravity start|top" into nyc-dev am:
a1bbb76806
am:
df46861131
Change-Id: Id48220d390d847fcdfa5f844bfe7b3567eddcbda
Adam Powell [Mon, 29 Aug 2016 22:29:18 +0000 (22:29 +0000)]
Force AlertDialogLayout to have gravity start|top am:
00c4f7ba65
am:
426750d9c6
Change-Id: Icb4b911f82aba87f587be444431417eb88c03988
Chet Haase [Mon, 29 Aug 2016 22:29:15 +0000 (22:29 +0000)]
Merge "FloatingActionMode: Fix screen coordinates." into nyc-dev am:
c80a4d7ae3
am:
55c66ce844
Change-Id: If5826fb63eb41f79aa9b3d4f3ad94610b08247e2
Abodunrinwa Toki [Mon, 29 Aug 2016 22:29:11 +0000 (22:29 +0000)]
FloatingActionMode: Fix screen coordinates. am:
99c340cad9
am:
6507b8b333
Change-Id: I76310131e709a38eb014628c6f52c617348a2a30
Chet Haase [Mon, 29 Aug 2016 22:18:55 +0000 (22:18 +0000)]
Merge "ChooserActivity: Cannot start app that the icon overflows the layout" into nyc-dev
am:
59fb472858
Change-Id: I257ec5926d5261fd508f91e5a60911aa752f4b48
Yuichi Biwa [Mon, 29 Aug 2016 22:18:46 +0000 (22:18 +0000)]
ChooserActivity: Cannot start app that the icon overflows the layout
am:
cb3e1237b5
Change-Id: I066aa6f03ea3c45fa1330556bc3a6db29ab48262
Chet Haase [Mon, 29 Aug 2016 22:18:34 +0000 (22:18 +0000)]
Merge "Set up view state before attaching, jump drawables if needed" into nyc-dev
am:
22e006214c
Change-Id: I8645ac4cf4cd398f74d77b62b9060a72a87a5411
Alan Viverette [Mon, 29 Aug 2016 22:18:28 +0000 (22:18 +0000)]
Set up view state before attaching, jump drawables if needed
am:
c328f042a6
Change-Id: Ie3df4a2e889577a7a64adc1fff4d773529da0d61
Chet Haase [Mon, 29 Aug 2016 22:18:19 +0000 (22:18 +0000)]
Merge "Force AlertDialogLayout to have gravity start|top" into nyc-dev
am:
a1bbb76806
Change-Id: I3bff93e0181b2e517a2cff6a00f9d205940f0da7
Adam Powell [Mon, 29 Aug 2016 22:18:15 +0000 (22:18 +0000)]
Force AlertDialogLayout to have gravity start|top
am:
00c4f7ba65
Change-Id: I268264e198ccb0d8394da68899406b96aaf5cb39
Chet Haase [Mon, 29 Aug 2016 22:18:11 +0000 (22:18 +0000)]
Merge "FloatingActionMode: Fix screen coordinates." into nyc-dev
am:
c80a4d7ae3
Change-Id: I72854a21958ca35bd94166fb2058f4fa38c11a87
Abodunrinwa Toki [Mon, 29 Aug 2016 22:18:07 +0000 (22:18 +0000)]
FloatingActionMode: Fix screen coordinates.
am:
99c340cad9
Change-Id: I73ff6d1b3bed01d7738634c67a6f6d1a2e755da1
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:34 +0000 (22:02 +0000)]
Merge "Eliminate next-alarm-clock broadcast flapping" into nyc-dev am:
2bbfe98062
am:
ea14c09012
Change-Id: Idf9669dbc5c9365a735f68ae3d53c29d69ce11a6
Christopher Tate [Mon, 29 Aug 2016 22:02:31 +0000 (22:02 +0000)]
Eliminate next-alarm-clock broadcast flapping am:
c60da1edc1
am:
b593999965
Change-Id: I92c0e8148ff3011a4183fc46f3304c09463887f0
Christopher Tate [Mon, 29 Aug 2016 21:56:03 +0000 (21:56 +0000)]
Merge "Eliminate next-alarm-clock broadcast flapping" into nyc-dev
am:
2bbfe98062
Change-Id: I30577f5760dabfc39faa117a9c9f8939b9cad49d
Christopher Tate [Mon, 29 Aug 2016 21:55:53 +0000 (21:55 +0000)]
Eliminate next-alarm-clock broadcast flapping
am:
c60da1edc1
Change-Id: I011c1ca4d3d0620d2c8c41b96422568bdc5fda31
TreeHugger Robot [Mon, 29 Aug 2016 21:47:02 +0000 (21:47 +0000)]
Merge "Eliminate next-alarm-clock broadcast flapping" into nyc-dev
Andrii Kulian [Mon, 29 Aug 2016 21:38:46 +0000 (21:38 +0000)]
Merge "DO NOT MERGE -- Fix finishing activity in non-focused stack" into nyc-dev am:
c8417676ed
am:
bdbf13e989
Change-Id: Ic824f161e9ded02999be463b2d9fb0dc42026a8d
Andrii Kulian [Mon, 29 Aug 2016 21:38:44 +0000 (21:38 +0000)]
DO NOT MERGE -- Fix finishing activity in non-focused stack am:
772c598f66
am:
3701296a70
Change-Id: I538137e37e0fa738201c953d9590cc96115313d7
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: Id80f837166f392e6490a09cfb22d1b748e19b5f5
Andrii Kulian [Mon, 29 Aug 2016 21:16:58 +0000 (21:16 +0000)]
DO NOT MERGE -- Fix finishing activity in non-focused stack
am:
772c598f66
Change-Id: I6d5a62f4d19bb1043a117b4d5a085152bed45200
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
Tao Bao [Mon, 29 Aug 2016 19:48:41 +0000 (19:48 +0000)]
Bump up the uncrypt timeout to 30 min. am:
8abcfed8a4 am:
c5a17fc39f
am:
8c682f8441
Change-Id: I5002fd9efaaefcd63f25dcddc8e4603d6280b46b
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:33:29 +0000 (19:33 +0000)]
Bump up the uncrypt timeout to 30 min. am:
8abcfed8a4
am:
c5a17fc39f
Change-Id: Ie634af4f18044ffaf98c21149c1635b6ad8b9a3f
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
Felipe Leme [Mon, 29 Aug 2016 19:25:02 +0000 (19:25 +0000)]
Merge "Fixed statuses on Battery Saver column." am:
21e0701f76 am:
bb205d5e3e
am:
6a1dd43194
Change-Id: Ia8e0bc64185f6ddb2874f266b125740537bd73cd
Andrii Kulian [Mon, 29 Aug 2016 19:24:59 +0000 (19:24 +0000)]
Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev am:
128a4419e9
am:
819de103db
Change-Id: I63f8b3f16e74044923112444380e580c34d997e9
Andrii Kulian [Mon, 29 Aug 2016 19:24:57 +0000 (19:24 +0000)]
DO NOT MERGE -- Correctly finish activity in non-focused stack am:
620040db3f
am:
d1fb246dad -s ours
Change-Id: Id36d853d58dd0cb91192511fab8e6863b1c87325
Felipe Leme [Mon, 29 Aug 2016 18:55:32 +0000 (18:55 +0000)]
Merge "Fixed statuses on Battery Saver column." am:
21e0701f76
am:
bb205d5e3e
Change-Id: I3c4e517b25b9e1c709baa11fe8568a8efecafea9
Felipe Leme [Mon, 29 Aug 2016 18:44:28 +0000 (18:44 +0000)]
Merge "Fixed statuses on Battery Saver column."
am:
21e0701f76
Change-Id: I4125ff3ad049ef2717fe12ba7ca62d99bf9bd3c5
Andrii Kulian [Mon, 29 Aug 2016 18:44:15 +0000 (18:44 +0000)]
Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev
am:
128a4419e9
Change-Id: I86073e914c30743355c3dab7e6520c5a00eb5001
Andrii Kulian [Mon, 29 Aug 2016 18:44:12 +0000 (18:44 +0000)]
DO NOT MERGE -- Correctly finish activity in non-focused stack
am:
620040db3f
Change-Id: If7adc0d548380cfe397bbdd9469b818861583e0c
Jason Monk [Mon, 29 Aug 2016 18:33:04 +0000 (18:33 +0000)]
Merge "Fix double status bar icons" into nyc-dev am:
2b4e612b10
am:
67566858af
Change-Id: I52d32ec39c5f6d8923b08d05d864c7f010b3562f
Jason Monk [Mon, 29 Aug 2016 18:32:57 +0000 (18:32 +0000)]
Fix double status bar icons am:
12124d7eca
am:
829548a3cb
Change-Id: Ieeb5792253ef05bf8a4d41aa1074a613c012626c
Felipe Leme [Mon, 29 Aug 2016 18:32:27 +0000 (18:32 +0000)]
Merge "Fixed statuses on Battery Saver column."
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
Felipe Leme [Thu, 14 Jul 2016 18:04:49 +0000 (11:04 -0700)]
Fixed statuses on Battery Saver column.
BUG:
30139400
Change-Id: I1798607af13c9be5e1f21212fd7078f7152562bd
(cherry picked from commit
9e325706f42a1dc48abe80a24323fae4579ab033)
Selim Cinek [Mon, 29 Aug 2016 18:25:52 +0000 (18:25 +0000)]
Merge "Fixed a bug where notifications could reappear" into nyc-dev am:
4226dcef1e
am:
96b67bcd1c
Change-Id: If825fcb67f36f7c3b89c353ef887e7ef97f0cf95
Selim Cinek [Mon, 29 Aug 2016 18:25:49 +0000 (18:25 +0000)]
Fixed a bug where notifications could reappear am:
f3b64692a3
am:
b7f50bedb1
Change-Id: I35b4112bc998abdd20990dc65c3c9b05f09a5e8b
Selim Cinek [Mon, 29 Aug 2016 18:25:46 +0000 (18:25 +0000)]
Fixed a bug where the headsup would be stuck disappearing am:
a4155bb7c0
am:
ad235b03fb
Change-Id: Ife6b45b0bd3f589cba40aecf2e2300679b00b710
Yohei Yukawa [Fri, 5 Aug 2016 22:38:55 +0000 (15:38 -0700)]
Make sure IME focus is synced to View focus
This CL fixes an edge case that my previous CL [1] forgot to handle.
The goal of my previous CL was to avoid InputMethodManager from getting
confused by a false focus-in event from temporarily detached Views.
However, my CL forgot to take care of the case where the temporarily
detached View is still focused even after the temporary detach mode is
done.
The bad news is that such a situation is relatively easy to trigger by
having a ListView that has EditText as follows, which seems to be
known to be a common technique in Android developer community to put an
EditText in a ListView.
ListView#listView.addHeaderView(new EditText(context), null, true);
If the ListView is initialized as above, and the EditText has input
focus, View focus and IME focus start to disagree immediatelly after the
ListView's layout is re-evaluated. This is really easy to trigger, for
example just by dismissing the IME window.
In summary, the root cause is that InputMethodManager#focusIn(View) is
now always ignored as long as the View is temporarily detached, under an
assumption that IMM#focusIn(View) will be called back again with a View
that is not temporarily detached when everything is stable. Hence the
fix is to do so by hooking up View#dispatchFinishTemporaryDetach() to
call IMM#focusIn(View) again when the View is actually focused in the
final state.
[1]: Ia79bbd8468f768d546354382b47b39dd31ef7bb5
a4ed0cfcb6885beeb52f701bfc64c393b668f7ba
Bug:
30022872
Bug:
30578745
Bug:
30706985
Change-Id: Iecbdb00dcef8c72e4f7b31035c9bf0f4a40a578f
(cherry picked from commit
dd228fbb4d2cb3d178ed7f1889343bfe177aafa2)
Jason Monk [Mon, 29 Aug 2016 18:17:16 +0000 (18:17 +0000)]
Merge "Fix double status bar icons" into nyc-dev
am:
2b4e612b10
Change-Id: Ic50aea16f2c5dd14c56dac581f9780e49626ddb5
Jason Monk [Mon, 29 Aug 2016 18:17:12 +0000 (18:17 +0000)]
Fix double status bar icons
am:
12124d7eca
Change-Id: Ib9208ba63774a65d6aac32f9af06abd2769dbd43
Greg Kaiser [Mon, 29 Aug 2016 18:16:36 +0000 (18:16 +0000)]
Merge "ContextHubService: Allow cancelling load/unload" into nyc-mr1-dev am:
40e6194148
am:
4db7ca82d4
Change-Id: I8ed8c8210b8ea1429e165db322ce302fa2d00c56
Greg Kaiser [Mon, 29 Aug 2016 18:16:04 +0000 (18:16 +0000)]
ContextHubService: Allow cancelling load/unload am:
29e868071d
am:
a0d483e410
Change-Id: If6bf3ed85f3e5c47e2d2cdae0313378f85577765
Greg Kaiser [Mon, 29 Aug 2016 18:15:46 +0000 (18:15 +0000)]
Merge "ContextHubService: Hack in Google vendor value" into nyc-mr1-dev am:
143aaa6d05
am:
2c168b28f9
Change-Id: I0bc48796a46d39f94b10ba7ae001b8f1877055ef
Greg Kaiser [Mon, 29 Aug 2016 18:10:02 +0000 (18:10 +0000)]
ContextHubService: Hack in Google vendor value am:
5817ce0c13
am:
3d2f2a4305
Change-Id: I756f0dd3f2744460ab13fa63a4813eb3c6c49ae4
Amith Yamasani [Mon, 29 Aug 2016 18:09:58 +0000 (18:09 +0000)]
Merge "Add logging to CursorWindow JNI code to track #
31046363" into nyc-mr1-dev am:
81f876e795
am:
5914b96565
Change-Id: I0ceb0c3ab962f974ac907699851bbe3f35d58900
Amith Yamasani [Mon, 29 Aug 2016 18:09:54 +0000 (18:09 +0000)]
Add logging to CursorWindow JNI code to track #
31046363 am:
0903ec5017
am:
99a6d16639
Change-Id: I486dd4f9cba0301f2b901e7c4b62be08d343c2e3
Pablo Ceballos [Mon, 29 Aug 2016 18:09:35 +0000 (18:09 +0000)]
Merge "Fail createVirtualDisplay with single-buffered Surface" into nyc-mr1-dev am:
23784fd6d9
am:
ed8f06673a
Change-Id: I0dee0e094528b81007507b8ddd5149da5ce17991
Selim Cinek [Mon, 29 Aug 2016 18:08:49 +0000 (18:08 +0000)]
Merge "Fixed a bug where notifications could reappear" into nyc-dev
am:
4226dcef1e
Change-Id: I2f31b0a2e9d2426b6a22924b2f19ccf7590f86d0
Selim Cinek [Mon, 29 Aug 2016 18:08:42 +0000 (18:08 +0000)]
Fixed a bug where notifications could reappear
am:
f3b64692a3
Change-Id: I6cfebd6d64d09c153ba21dea7ff96793d4595ab7
Pablo Ceballos [Mon, 29 Aug 2016 18:08:29 +0000 (18:08 +0000)]
Fail createVirtualDisplay with single-buffered Surface am:
aff2f94939
am:
d387b20dcb
Change-Id: I8d438809f79ac8b333acaadc14f751f4282b93d7
Selim Cinek [Mon, 29 Aug 2016 18:08:28 +0000 (18:08 +0000)]
Fixed a bug where the headsup would be stuck disappearing
am:
a4155bb7c0
Change-Id: Ibb48a2b105212634bdff1daadb53be3f5caa4413
Jason Monk [Mon, 29 Aug 2016 18:00:00 +0000 (18:00 +0000)]
Merge "Fix double status bar icons" into nyc-dev
Greg Kaiser [Mon, 29 Aug 2016 17:59:30 +0000 (17:59 +0000)]
Merge "ContextHubService: Allow cancelling load/unload" into nyc-mr1-dev
am:
40e6194148
Change-Id: Idcb9f7a4f621f9dc2c66204ef9bd31b9a0649be0
Greg Kaiser [Mon, 29 Aug 2016 17:59:28 +0000 (17:59 +0000)]
ContextHubService: Allow cancelling load/unload
am:
29e868071d
Change-Id: I6c3b5130972907fae1849e596aec8c37ed47e65b
Greg Kaiser [Mon, 29 Aug 2016 17:59:25 +0000 (17:59 +0000)]
Merge "ContextHubService: Hack in Google vendor value" into nyc-mr1-dev
am:
143aaa6d05
Change-Id: I9104870e67e6fe86f294be831575a8c79549fd45
Greg Kaiser [Mon, 29 Aug 2016 17:59:23 +0000 (17:59 +0000)]
ContextHubService: Hack in Google vendor value
am:
5817ce0c13
Change-Id: I168a2a2a50168f7590842b5c51fbc8a80842b00e
Amith Yamasani [Mon, 29 Aug 2016 17:59:21 +0000 (17:59 +0000)]
Merge "Add logging to CursorWindow JNI code to track #
31046363" into nyc-mr1-dev
am:
81f876e795
Change-Id: I42aac53add1740ee2253821099da7f9dc45f57d2
Amith Yamasani [Mon, 29 Aug 2016 17:59:19 +0000 (17:59 +0000)]
Add logging to CursorWindow JNI code to track #
31046363
am:
0903ec5017
Change-Id: Idde495c1662be20d20a907521ae4e0dbaf5ad88c
Pablo Ceballos [Mon, 29 Aug 2016 17:59:16 +0000 (17:59 +0000)]
Merge "Fail createVirtualDisplay with single-buffered Surface" into nyc-mr1-dev
am:
23784fd6d9
Change-Id: Id5eb1742d13fda9ac1d8a1354e4dacd458f2949c
Pablo Ceballos [Mon, 29 Aug 2016 17:59:07 +0000 (17:59 +0000)]
Fail createVirtualDisplay with single-buffered Surface
am:
aff2f94939
Change-Id: I5cfcbd0352240d7ac2a9bb0804896cae5396450e
TreeHugger Robot [Mon, 29 Aug 2016 17:58:28 +0000 (17:58 +0000)]
Merge "Fixed a bug where notifications could reappear" into nyc-dev
Greg Kaiser [Mon, 29 Aug 2016 17:48:45 +0000 (17:48 +0000)]
Merge "ContextHubService: Allow cancelling load/unload" into nyc-mr1-dev
Greg Kaiser [Mon, 29 Aug 2016 17:43:29 +0000 (17:43 +0000)]
Merge "ContextHubService: Hack in Google vendor value" into nyc-mr1-dev
Amith Yamasani [Mon, 29 Aug 2016 17:42:37 +0000 (17:42 +0000)]
Merge "Add logging to CursorWindow JNI code to track #
31046363" into nyc-mr1-dev
Pablo Ceballos [Mon, 29 Aug 2016 17:41:57 +0000 (17:41 +0000)]
Merge "Fail createVirtualDisplay with single-buffered Surface" into nyc-mr1-dev
Greg Kaiser [Fri, 26 Aug 2016 06:04:08 +0000 (23:04 -0700)]
ContextHubService: Allow cancelling load/unload
As a minimal risk improvement for Android N, we allow a new
load/unload transaction request to cancel a currently pending
one if enough time has passed since starting the current
transaction.
Bug:
30111539
Change-Id: Ide958c2454b88529305443fb789b8ae5af18c642
Jason Monk [Tue, 26 Jul 2016 17:04:50 +0000 (13:04 -0400)]
Fix double status bar icons
Don't allow the status bar icon slot list to be changed because
it confuses the relationship between StatusBarIconList and
StatusBarIconController. Set it in the constructor to enforce
this.
Change-Id: Ieeea0a9efad88179d1cccc0e5702899333de2e72
Fixes:
28524184
(cherry picked from commit
c6fe61c59c5a3a6ae691256c9afdde3820e3dd9e)
Narayan Kamath [Mon, 29 Aug 2016 11:50:01 +0000 (11:50 +0000)]
Fix clang build breakage (-Werror -Wformat). am:
b334c33d65
am:
2cf3cc82e3
Change-Id: I5bb346f44b9d0f5b190df1e94015b7b653df5248
Narayan Kamath [Mon, 29 Aug 2016 11:43:01 +0000 (11:43 +0000)]
Fix clang build breakage (-Werror -Wformat).
am:
b334c33d65
Change-Id: I36f6e388d8294d5650c2bcc1ab2eaec81e09a263
Narayan Kamath [Mon, 29 Aug 2016 11:31:41 +0000 (12:31 +0100)]
Fix clang build breakage (-Werror -Wformat).
Use %zd for size_t. Note that this will break only on (-plus-)aosp because
clang is disabled on the N development branches.
bug:
30963384
Change-Id: I4b5ba7caf15bc2ebf5bb3395d82170ec786ed50c
Narayan Kamath [Mon, 29 Aug 2016 10:48:59 +0000 (10:48 +0000)]
Reopen whitelisted zygote file descriptors after a fork. am:
c5f27a7cb2
am:
c94d2ddf2b
Change-Id: I8052ec8a57e67421d4d6f8038cb752c08d8bc3c1
Narayan Kamath [Mon, 29 Aug 2016 10:42:24 +0000 (10:42 +0000)]
Reopen whitelisted zygote file descriptors after a fork.
am:
c5f27a7cb2
Change-Id: If8294753c0c78620cde80a76389022684110ddd0
Narayan Kamath [Fri, 19 Aug 2016 12:45:24 +0000 (13:45 +0100)]
Reopen whitelisted zygote file descriptors after a fork.
We don't want these descriptors to be shared post-fork, so we'll
have to close and reopen them when the zygote forks. The set of
open descriptors is checked against a whitelist and it is a fatal
error if a non whitelisted FD is opened. It is also a fatal error
if anything other than a regular file / character device or socket
is opened at the time of forking.
This work is done in two stages :
- An initial list of FDs is constructed and cached prior to the
first zygote fork.
- On each subsequent fork, we check whether the list of open FDs
has changed. We are currently tolerant of changes, but in the
longer term, it should be a fatal error if the set of open file
descriptors in the zygote changes.
- Post fork, we traverse the list of open descriptors and reopen
them if necessary.
bug:
30963384
Change-Id: Icfd45c96c660491b554d146a9d70d97dbcc712bc
Yi Kong [Mon, 29 Aug 2016 08:15:53 +0000 (08:15 +0000)]
Merge "Track getxattr API change" am:
c4c4a1e76e am:
f897e1c3b6
am:
2b5a0d299d
Change-Id: I845657a3c8f14f38f0c3b490d16677620ba0bcc4
Yi Kong [Mon, 29 Aug 2016 08:09:52 +0000 (08:09 +0000)]
Merge "Track getxattr API change" am:
c4c4a1e76e
am:
f897e1c3b6
Change-Id: I47ac9cfbd5a38849dad542089cb3fa923a8cd3fe
Yi Kong [Mon, 29 Aug 2016 08:05:05 +0000 (08:05 +0000)]
Merge "Track getxattr API change"
am:
c4c4a1e76e
Change-Id: I66059536d5dfb0999743656f095d557ddf25ff70
Treehugger Robot [Mon, 29 Aug 2016 07:57:29 +0000 (07:57 +0000)]
Merge "Track getxattr API change"
Felipe Leme [Sun, 28 Aug 2016 22:42:37 +0000 (22:42 +0000)]
Removed screen on/off callbacks from NPMS. am:
b79f06a476 am:
a4defc17c7
am:
2c6a1fb0e1
Change-Id: I33792d30ba97be1b4244619c4a73f95352e2776f
Felipe Leme [Sun, 28 Aug 2016 22:33:42 +0000 (22:33 +0000)]
Removed screen on/off callbacks from NPMS. am:
b79f06a476
am:
a4defc17c7
Change-Id: I044cb8bba3fba37cd8bb29961feeab3e279f9e08