OSDN Git Service
Steve McKay [Fri, 15 Jul 2016 19:21:43 +0000 (12:21 -0700)]
Remove vestigial config setting.
Change-Id: I8cd1558ae76833d4f0e511f05fc6e66d9ff44a7e
Adam Lesinski [Fri, 15 Jul 2016 19:06:10 +0000 (19:06 +0000)]
Merge "Build SystemUI and Keyguard with AAPT2"
Etan Cohen [Fri, 15 Jul 2016 16:52:06 +0000 (16:52 +0000)]
[NAN] NAN System Api: RTT
am:
ab9ef45971
Change-Id: I34039caac1a40a2c26d8a89d5a0d938fa5a4af62
Pankaj Kanwar [Fri, 15 Jul 2016 15:23:35 +0000 (15:23 +0000)]
Merge \\"Add alternative EXTRA_CALL_RAT_TYPE definition for noncompliant modems.\\" into nyc-mr1-dev am:
9e73d82336
am:
933e5f9f87
Change-Id: I42509be5aaf59525014f09b4dad81dc4811d5b69
Tyler Gunn [Fri, 15 Jul 2016 15:18:07 +0000 (15:18 +0000)]
Merge \"Add alternative EXTRA_CALL_RAT_TYPE definition for noncompliant modems.\" into nyc-mr1-dev
am:
9e73d82336
Change-Id: Idd57c35f04193ab1157e455f4c4242e30c9ea7a2
Pankaj Kanwar [Fri, 15 Jul 2016 15:10:26 +0000 (15:10 +0000)]
Merge "Add alternative EXTRA_CALL_RAT_TYPE definition for noncompliant modems." into nyc-mr1-dev
Julia Reynolds [Fri, 15 Jul 2016 14:51:53 +0000 (14:51 +0000)]
Merge \"Merge \\\\\\\"Check caller\\\\\\\'s uid before allowing notification policy access.\\\\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89 am:
e1d8b98189 -s ours am:
8e6b7c2f72 am:
837696131e\" into nyc-mr1-dev-plus-aosp
am:
38e88e249e
Change-Id: Ib4313f8eb0a0171bdfb1d8fc55f5678181c25686
Julia Reynolds [Fri, 15 Jul 2016 14:44:55 +0000 (14:44 +0000)]
Merge \\\\\\\"Check caller\\\\\\\'s uid before allowing notification policy access.\\\\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89 am:
e1d8b98189 -s ours am:
8e6b7c2f72 am:
d59fc3a5c9
am:
a109154633
Change-Id: I95f7fd04b4b81c51a36878212badfa3e8820fb92
Android Build Merger (Role) [Fri, 15 Jul 2016 14:41:34 +0000 (14:41 +0000)]
Merge "Merge \\\\\\"Check caller\\\\\\'s uid before allowing notification policy access.\\\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89 am:
e1d8b98189 -s ours am:
8e6b7c2f72 am:
837696131e" into nyc-mr1-dev-plus-aosp
Julia Reynolds [Fri, 15 Jul 2016 14:41:06 +0000 (14:41 +0000)]
Merge \\\\\\"Check caller\\\\\\'s uid before allowing notification policy access.\\\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89 am:
e1d8b98189 -s ours am:
8e6b7c2f72
am:
837696131e
Change-Id: I76348913cc4d0905edb3badc45883bb4d14645ee
Julia Reynolds [Fri, 15 Jul 2016 14:41:05 +0000 (14:41 +0000)]
Merge \\\\\\"Check caller\\\\\\'s uid before allowing notification policy access.\\\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89 am:
e1d8b98189 -s ours am:
8e6b7c2f72
am:
d59fc3a5c9
Change-Id: I1fa80e1f61ac3e2a8d929261d56334f715a6a377
Julia Reynolds [Fri, 15 Jul 2016 14:34:21 +0000 (14:34 +0000)]
Merge \\\\\"Check caller\\\\\'s uid before allowing notification policy access.\\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89 am:
e1d8b98189 -s ours
am:
8e6b7c2f72
Change-Id: I0d01f75f3ba19142675de8c589071af9888deeab
Julia Reynolds [Fri, 15 Jul 2016 14:34:14 +0000 (14:34 +0000)]
Merge \\\\\"Check caller\\\\\'s uid before allowing notification policy access.\\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89 am:
e1d8b98189 -s ours
am:
8e6b7c2f72
Change-Id: I10e3412be1a534f5511f72da63ea7581cab21140
Julia Reynolds [Fri, 15 Jul 2016 14:27:24 +0000 (14:27 +0000)]
Merge \\\\"Check caller\\\\'s uid before allowing notification policy access.\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89
am:
e1d8b98189 -s ours
Change-Id: I583fa066aaf12cacb841b10f751ad0ad7a1de237
Julia Reynolds [Fri, 15 Jul 2016 14:17:56 +0000 (14:17 +0000)]
Merge \\\"Check caller\\\'s uid before allowing notification policy access.\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c
am:
5c6db3af89
Change-Id: Ie212c6105f8796f0e7c4ccf25ea132b8c9f99519
Julia Reynolds [Fri, 15 Jul 2016 14:12:23 +0000 (14:12 +0000)]
Merge \\"Check caller\\'s uid before allowing notification policy access.\\" into mnc-dev am:
234e1c25e4
am:
8e8bb6633c
Change-Id: Ic36dbb69f0eeddd85b17579b2fc90f75349e4ca3
Julia Reynolds [Fri, 15 Jul 2016 14:06:49 +0000 (14:06 +0000)]
Merge \"Check caller\'s uid before allowing notification policy access.\" into mnc-dev
am:
234e1c25e4
Change-Id: I6724832d28362a76cd2f65432d6e805738f335fa
Julia Reynolds [Fri, 15 Jul 2016 13:59:04 +0000 (13:59 +0000)]
Merge "Check caller's uid before allowing notification policy access." into mnc-dev
Ricky Wai [Fri, 15 Jul 2016 10:24:05 +0000 (10:24 +0000)]
Merge \\"Remove tied profile encryption key cache in keystore\\" into nyc-mr1-dev am:
3ed2a52bb1
am:
39cfbde069
Change-Id: Ia312112030d12ff012165ccbe0e7adaf67b95bf8
Ricky Wai [Fri, 15 Jul 2016 10:18:36 +0000 (10:18 +0000)]
Merge \"Remove tied profile encryption key cache in keystore\" into nyc-mr1-dev
am:
3ed2a52bb1
Change-Id: I127bb8329b374e57147b42f13f699b3125872367
Ricky Wai [Fri, 15 Jul 2016 10:09:39 +0000 (10:09 +0000)]
Merge "Remove tied profile encryption key cache in keystore" into nyc-mr1-dev
Tony Mak [Fri, 15 Jul 2016 07:30:36 +0000 (07:30 +0000)]
Merge \\"Whitelisting device provisioning package from app standby\\" into nyc-mr1-dev am:
0c5b73ffc2
am:
e7ad96f9a8
Change-Id: I2412e0506286a8f9887c61fe4dc3ecf29b016c41
Tony Mak [Fri, 15 Jul 2016 07:25:01 +0000 (07:25 +0000)]
Merge \"Whitelisting device provisioning package from app standby\" into nyc-mr1-dev
am:
0c5b73ffc2
Change-Id: Id61bd55703b1cbf6410a6b668c26170ab3621efa
Tony Mak [Fri, 15 Jul 2016 07:17:42 +0000 (07:17 +0000)]
Merge "Whitelisting device provisioning package from app standby" into nyc-mr1-dev
Alan Leung [Fri, 15 Jul 2016 06:12:32 +0000 (06:12 +0000)]
Merge \\"Fix thread priority after boosting.\\" into nyc-mr1-dev am:
1e9b8138f0
am:
379df004a0
Change-Id: If4c3e2c72dcca52ec3a6789b6c5fd907edeb9a47
Alan Leung [Fri, 15 Jul 2016 06:06:58 +0000 (06:06 +0000)]
Merge \"Fix thread priority after boosting.\" into nyc-mr1-dev
am:
1e9b8138f0
Change-Id: I613e3a0b1597ce59913663264f81673448426622
Alan Leung [Fri, 15 Jul 2016 06:00:06 +0000 (06:00 +0000)]
Merge "Fix thread priority after boosting." into nyc-mr1-dev
Lajos Molnar [Fri, 15 Jul 2016 05:59:39 +0000 (05:59 +0000)]
Merge \\"media: document new temporal layering schema values.\\" into nyc-mr1-dev am:
12f860f5a2
am:
878069382e
Change-Id: Iffd7f35b5c6e53ddcc4728a422839298b13503da
Lajos Molnar [Fri, 15 Jul 2016 05:59:32 +0000 (05:59 +0000)]
Merge \\"media: clarify MediaFormat.KEY_I_FRAME_INTERVAL\\" into nyc-mr1-dev am:
991c240a88
am:
525d917ac9
Change-Id: I6c5088ec6b2b7810acf2c3e6835b205f80eded06
Lajos Molnar [Fri, 15 Jul 2016 05:53:37 +0000 (05:53 +0000)]
Merge \"media: document new temporal layering schema values.\" into nyc-mr1-dev
am:
12f860f5a2
Change-Id: Ifb3c99ca6e4b2a9dcec6d58afacbcba474ea4d73
Lajos Molnar [Fri, 15 Jul 2016 05:53:28 +0000 (05:53 +0000)]
Merge \"media: clarify MediaFormat.KEY_I_FRAME_INTERVAL\" into nyc-mr1-dev
am:
991c240a88
Change-Id: Id1e1bfdb65b10f5e7b99a0e164afc05ca2518dbf
Lajos Molnar [Fri, 15 Jul 2016 05:44:03 +0000 (05:44 +0000)]
Merge "media: document new temporal layering schema values." into nyc-mr1-dev
Lajos Molnar [Fri, 15 Jul 2016 05:43:39 +0000 (05:43 +0000)]
Merge "media: clarify MediaFormat.KEY_I_FRAME_INTERVAL" into nyc-mr1-dev
Lajos Molnar [Fri, 15 Jul 2016 02:54:50 +0000 (19:54 -0700)]
media: clarify MediaFormat.KEY_I_FRAME_INTERVAL
Bug:
30096321
Change-Id: I908b669caf5443fb272a2d274b7cbf7227913b3e
Hugo Benichi [Fri, 15 Jul 2016 04:11:33 +0000 (04:11 +0000)]
Merge \\"APF: filter unwanted ARP replies\\" into nyc-mr1-dev am:
b91c1232ee
am:
599c9c764e
Change-Id: Ic45bd53872102c7e6fdf02a79d29f82744ee1695
Hugo Benichi [Fri, 15 Jul 2016 04:06:17 +0000 (04:06 +0000)]
Merge \"APF: filter unwanted ARP replies\" into nyc-mr1-dev
am:
b91c1232ee
Change-Id: I8b1ea85b57b3075b1ebce7b3332aca656e5391af
TreeHugger Robot [Fri, 15 Jul 2016 03:59:48 +0000 (03:59 +0000)]
Merge "APF: filter unwanted ARP replies" into nyc-mr1-dev
Tony Mak [Thu, 14 Jul 2016 07:30:18 +0000 (15:30 +0800)]
Whitelisting device provisioning package from app standby
Change-Id: Ib9cb7a3fdf7aa16a97f22eacbed872880b7f9fbe
Fix:
29892977
TreeHugger Robot [Fri, 15 Jul 2016 03:35:49 +0000 (03:35 +0000)]
Merge "Addition UserInputHandler test coverage."
Lajos Molnar [Fri, 15 Jul 2016 02:10:27 +0000 (19:10 -0700)]
media: document new temporal layering schema values.
Also fix doc as these are advertised on the output port.
Bug:
30150921
Bug:
27596987
Change-Id: Ia95876ade36bc82eea0e9795dea0268abbd1c1ef
Chris Tate [Fri, 15 Jul 2016 01:58:04 +0000 (01:58 +0000)]
Merge \\"Thread-safe pipe teardown during restore operations\\" into nyc-mr1-dev am:
4595bc7f12
am:
f74ff47988
Change-Id: I562d94384d4ca4d788c704aca64fa16b613d38e8
Chris Tate [Fri, 15 Jul 2016 01:58:02 +0000 (01:58 +0000)]
Merge \\"Dump the source uid of scheduled jobs\\" into nyc-mr1-dev am:
b30e1f75d1
am:
562d906f95
Change-Id: I9bb1e812fec40f1f3a7556780d8fab54cd21eea9
Chris Tate [Fri, 15 Jul 2016 01:57:59 +0000 (01:57 +0000)]
Merge \\"Test existence of wallpaper files before backing them up\\" into nyc-mr1-dev am:
8b08553e90
am:
4a74ffc1b5
Change-Id: I897aec4788c757ffdf1982f9b4c9dee3c29f2433
Selim Cinek [Fri, 15 Jul 2016 01:57:57 +0000 (01:57 +0000)]
Merge \\"Fixed a bug where the burmese clock could overlap\\" into nyc-mr1-dev am:
f25486f8a5
am:
a8c8cf5314
Change-Id: I80a521699b870eeb57085f610e6ddedd44071273
Christopher Tate [Fri, 15 Jul 2016 01:49:31 +0000 (01:49 +0000)]
Merge \"Thread-safe pipe teardown during restore operations\" into nyc-mr1-dev
am:
4595bc7f12
Change-Id: I8c53961f93633f26615970c40d071f2e8d714780
Christopher Tate [Fri, 15 Jul 2016 01:49:26 +0000 (01:49 +0000)]
Merge \"Dump the source uid of scheduled jobs\" into nyc-mr1-dev
am:
b30e1f75d1
Change-Id: I50d5d91c0fd2713d1fdfe027bcf11865b6863452
Christopher Tate [Fri, 15 Jul 2016 01:49:19 +0000 (01:49 +0000)]
Merge \"Test existence of wallpaper files before backing them up\" into nyc-mr1-dev
am:
8b08553e90
Change-Id: Ic5acc8c87cef80795c3e286f9e24604af35ff6f5
Selim Cinek [Fri, 15 Jul 2016 01:49:11 +0000 (01:49 +0000)]
Merge \"Fixed a bug where the burmese clock could overlap\" into nyc-mr1-dev
am:
f25486f8a5
Change-Id: I5184fb95e70251291e5426c07e882e346a7e51f4
Chris Tate [Fri, 15 Jul 2016 01:38:02 +0000 (01:38 +0000)]
Merge "Thread-safe pipe teardown during restore operations" into nyc-mr1-dev
Chris Tate [Fri, 15 Jul 2016 01:37:19 +0000 (01:37 +0000)]
Merge "Dump the source uid of scheduled jobs" into nyc-mr1-dev
Chris Tate [Fri, 15 Jul 2016 01:36:46 +0000 (01:36 +0000)]
Merge "Test existence of wallpaper files before backing them up" into nyc-mr1-dev
TreeHugger Robot [Fri, 15 Jul 2016 01:33:32 +0000 (01:33 +0000)]
Merge "Fixed a bug where the burmese clock could overlap" into nyc-mr1-dev
Steve McKay [Wed, 13 Jul 2016 20:03:16 +0000 (13:03 -0700)]
Addition UserInputHandler test coverage.
Pull event handling logic out of MultiSelectManager into UserInputHandler.
Pull out a couple common test support classes.
Change-Id: I8958fec9cda05f52192a07a682c318e049871a8d
Makoto Onuki [Fri, 15 Jul 2016 00:55:59 +0000 (00:55 +0000)]
Merge \\"Handle locale change and pacakge change in different way\\" into nyc-mr1-dev am:
83fa7a8255
am:
22963b8937
Change-Id: I39da795eeed8bb3d0e53b0ed02663cce1088cabf
Makoto Onuki [Fri, 15 Jul 2016 00:49:28 +0000 (00:49 +0000)]
Merge \"Handle locale change and pacakge change in different way\" into nyc-mr1-dev
am:
83fa7a8255
Change-Id: I4988ff6c77f70211336e21729f0f6cd69beefc7d
Lajos Molnar [Fri, 15 Jul 2016 00:39:10 +0000 (00:39 +0000)]
Merge \\"media: clarify notes in MediaCodec doc\\" into nyc-mr1-dev am:
82d886434d
am:
1d356c895b
Change-Id: I086a5de8bb581d5d908dacee82e4d93403e73320
Makoto Onuki [Fri, 15 Jul 2016 00:39:04 +0000 (00:39 +0000)]
Merge "Handle locale change and pacakge change in different way" into nyc-mr1-dev
Lajos Molnar [Fri, 15 Jul 2016 00:35:12 +0000 (00:35 +0000)]
Merge \"media: clarify notes in MediaCodec doc\" into nyc-mr1-dev
am:
82d886434d
Change-Id: Iacc43f3db9a41a0373227fc09f3590cf275ec34f
Lajos Molnar [Fri, 15 Jul 2016 00:25:29 +0000 (00:25 +0000)]
Merge "media: clarify notes in MediaCodec doc" into nyc-mr1-dev
Selim Cinek [Fri, 15 Jul 2016 00:19:25 +0000 (00:19 +0000)]
Merge \\"Fixed the heads up disspearing bug for real\\" into nyc-mr1-dev am:
70b06cc62f
am:
58526c8391
Change-Id: I4d60c9ee527228541d393f725854081ac13f3c91
Justin Klaassen [Fri, 15 Jul 2016 00:13:54 +0000 (00:13 +0000)]
Merge \\"Don\\'t activate Night display until user setup is complete\\" into nyc-mr1-dev am:
6028472b8a
am:
21558d12d8
Change-Id: Ib6b196dc54affb5e18580cdbff3b5c1016ab329b
Chris Craik [Fri, 15 Jul 2016 00:13:50 +0000 (00:13 +0000)]
Merge \\"Fix rotated clip regions\\" into nyc-mr1-dev am:
06f13cba5f
am:
d5cdbdeae1
Change-Id: Ib7db5a8fbbe4cfdd8cd7c8a06ad51477fc6df5a1
Selim Cinek [Fri, 15 Jul 2016 00:13:48 +0000 (00:13 +0000)]
Merge \"Fixed the heads up disspearing bug for real\" into nyc-mr1-dev
am:
70b06cc62f
Change-Id: I4f800199c871b862eefd1d813e8ed04f9485d7da
TreeHugger Robot [Fri, 15 Jul 2016 00:09:46 +0000 (00:09 +0000)]
Merge "Fixed the heads up disspearing bug for real" into nyc-mr1-dev
Justin Klaassen [Fri, 15 Jul 2016 00:08:54 +0000 (00:08 +0000)]
Merge \"Don\'t activate Night display until user setup is complete\" into nyc-mr1-dev
am:
6028472b8a
Change-Id: I2dbc30f9b7744df53e17276f438db0c65a24a341
Chris Craik [Fri, 15 Jul 2016 00:08:45 +0000 (00:08 +0000)]
Merge \"Fix rotated clip regions\" into nyc-mr1-dev
am:
06f13cba5f
Change-Id: I4afab3a863f1f873e9dd95ed671072874a6a4511
TreeHugger Robot [Fri, 15 Jul 2016 00:04:20 +0000 (00:04 +0000)]
Merge "Don't activate Night display until user setup is complete" into nyc-mr1-dev
Chris Craik [Fri, 15 Jul 2016 00:02:25 +0000 (00:02 +0000)]
Merge "Fix rotated clip regions" into nyc-mr1-dev
Etan Cohen [Thu, 14 Jul 2016 20:27:58 +0000 (13:27 -0700)]
[NAN] NAN System Api: RTT
Modify visibility of startRanging [NAN RTT] to SystemApi. Matches the
visibliity of the RttManager API.
Change-Id: Ia92de9885d0b38dfce74484f437bd122dd53cbf6
Jim Miller [Thu, 14 Jul 2016 23:55:37 +0000 (23:55 +0000)]
Merge \\"Fix bug where swiping on the fp sensor when the screen is off causes blank screen\\" into nyc-mr1-dev am:
538b836e05
am:
ba350f3512
Change-Id: Ia83a8afd2d55f53b90b17307e3214ee581de9ca6
Jim Miller [Thu, 14 Jul 2016 23:50:31 +0000 (23:50 +0000)]
Merge \"Fix bug where swiping on the fp sensor when the screen is off causes blank screen\" into nyc-mr1-dev
am:
538b836e05
Change-Id: I8391201f96bc408103727938a9b9aefd22f47793
TreeHugger Robot [Thu, 14 Jul 2016 23:45:11 +0000 (23:45 +0000)]
Merge "Fix bug where swiping on the fp sensor when the screen is off causes blank screen" into nyc-mr1-dev
Christopher Wiley [Thu, 14 Jul 2016 23:40:55 +0000 (23:40 +0000)]
Merge \\"Properly disable WiFi tethering\\" into nyc-mr1-dev am:
f3d9863d5e
am:
7c3fe775f2
Change-Id: I3f46d2263dc8d247590a0b37aa9b53ca74807262
Selim Cinek [Thu, 14 Jul 2016 23:32:23 +0000 (16:32 -0700)]
Fixed a bug where the burmese clock could overlap
Change-Id: I9ccd2fd5fd89c973d937196aa16d459e46eca769
Fixes:
26015598
Christopher Wiley [Thu, 14 Jul 2016 23:34:04 +0000 (23:34 +0000)]
Merge \"Properly disable WiFi tethering\" into nyc-mr1-dev
am:
f3d9863d5e
Change-Id: I3f6d475d01033930250fb97eb07b737ea546835d
TreeHugger Robot [Thu, 14 Jul 2016 23:26:55 +0000 (23:26 +0000)]
Merge "Properly disable WiFi tethering" into nyc-mr1-dev
TreeHugger Robot [Thu, 14 Jul 2016 23:26:00 +0000 (23:26 +0000)]
Merge "Fix a race and some comments in ClipStorage."
Selim Cinek [Thu, 14 Jul 2016 23:09:15 +0000 (23:09 +0000)]
Merge \\"Fixed a bug where the header was positioned wrong\\" into nyc-mr1-dev am:
b1008221f9
am:
c489f0bf06
Change-Id: I227c36c3384a08d395b58b146be9b7070072ff60
Philip Cuadra [Thu, 14 Jul 2016 23:04:36 +0000 (23:04 +0000)]
Merge \\"Call into ART to get the location of the odex/oat file to pin\\" into nyc-mr1-dev am:
8b072fbd48
am:
1510a6981b
Change-Id: Ia7450bbc482a375dcc030ee5fc32ef17670d1d50
Raph Levien [Thu, 14 Jul 2016 22:59:28 +0000 (22:59 +0000)]
Merge \\"Don\\'t count zero width space in hasGlyph layout\\" into nyc-mr1-dev am:
f9c8893d1b
am:
3fabee6f41 -s ours
Change-Id: I12897c0e574a16c48ae35f2c48f680d163b3d670
Selim Cinek [Thu, 14 Jul 2016 22:54:32 +0000 (22:54 +0000)]
Merge \"Fixed a bug where the header was positioned wrong\" into nyc-mr1-dev
am:
b1008221f9
Change-Id: I896f6ecbcda32d58edd4ed01ad2cce760db617b6
Raph Levien [Thu, 14 Jul 2016 22:50:53 +0000 (22:50 +0000)]
Merge \\"Treat U+2695, U+2640, U+2642 as emoji characters.\\" into nyc-mr1-dev am:
c0ab2e83ac
am:
d6acdcee26
Change-Id: I6f989b1a3d4a9a326ab129b507f0bb9093115cff
Raph Levien [Thu, 14 Jul 2016 22:50:50 +0000 (22:50 +0000)]
Merge \\"Delete gender-balanced emoji sequence by one backspace key event.\\" into nyc-mr1-dev am:
ef9e2a5f4b
am:
dc8ad8d49d
Change-Id: I7c140ee5bdbd1dba4cfcbc824ecfeef9861f7853
Justin Klaassen [Tue, 12 Jul 2016 04:26:46 +0000 (21:26 -0700)]
Don't activate Night display until user setup is complete
Bug:
30042357
Change-Id: I575c5e44b4109816ae14cc139ff171f141e6088f
TreeHugger Robot [Thu, 14 Jul 2016 22:50:07 +0000 (22:50 +0000)]
Merge "Fixed a bug where the header was positioned wrong" into nyc-mr1-dev
Philip Cuadra [Thu, 14 Jul 2016 22:38:15 +0000 (22:38 +0000)]
Merge \"Call into ART to get the location of the odex/oat file to pin\" into nyc-mr1-dev
am:
8b072fbd48
Change-Id: I3e5d753597a81d2cd1938781dce4370c383725ea
Raph Levien [Thu, 14 Jul 2016 22:37:57 +0000 (22:37 +0000)]
Merge \"Don\'t count zero width space in hasGlyph layout\" into nyc-mr1-dev
am:
f9c8893d1b
Change-Id: Ib84918cf6e12392fc58500d47feeb38ab28b7d43
Seigo Nonaka [Thu, 14 Jul 2016 22:37:53 +0000 (22:37 +0000)]
Merge \"Treat U+2695, U+2640, U+2642 as emoji characters.\" into nyc-mr1-dev
am:
c0ab2e83ac
Change-Id: Iaa4d63c425f5d263d322d463c320312890588aaf
Raph Levien [Thu, 14 Jul 2016 22:37:50 +0000 (22:37 +0000)]
Merge \\"Patch out part of the emoji tests.\\" into nyc-mr1-dev am:
2f39bc777c
am:
a77343f873
Change-Id: I60cc91a65e818cb78663647bfa249c896a7cff2c
Seigo Nonaka [Thu, 14 Jul 2016 22:37:50 +0000 (22:37 +0000)]
Merge \"Delete gender-balanced emoji sequence by one backspace key event.\" into nyc-mr1-dev
am:
ef9e2a5f4b
Change-Id: If60a0502875163ec60eeac61a3195e217b34e9f5
Sandra Kwan [Thu, 14 Jul 2016 22:31:31 +0000 (22:31 +0000)]
Merge "Allows AccountManager to start exported activities."
TreeHugger Robot [Thu, 14 Jul 2016 22:30:43 +0000 (22:30 +0000)]
Merge "Import translations. DO NOT MERGE"
Doug Felt [Thu, 14 Jul 2016 22:30:09 +0000 (22:30 +0000)]
Merge \"Patch out part of the emoji tests.\" into nyc-mr1-dev
am:
2f39bc777c
Change-Id: I90c3528cf6d85929114af94feb0ef2f36954ca9f
Sandra Kwan [Thu, 30 Jun 2016 21:34:01 +0000 (14:34 -0700)]
Allows AccountManager to start exported activities.
We prevent authenticators from using Settings to launch arbitrary
activities by checking if the activity has the same signature with the
authenticators. However, some activities
(GrantCredentialsPermissionActivity and CantAddAccountActivity) are
returned by AccountManagerService and should be allowed to start.
Bug:
18864662
Change-Id: I20c17f0864e6cee1cca901514da2638f551e5423
Philip Cuadra [Thu, 14 Jul 2016 22:26:20 +0000 (22:26 +0000)]
Merge "Call into ART to get the location of the odex/oat file to pin" into nyc-mr1-dev
Victor Chang [Thu, 14 Jul 2016 22:26:15 +0000 (22:26 +0000)]
Merge \"Merge \\\"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\\\" into nyc-dev am:
488042fe3b am:
c4ef7669a1\" into nyc-mr1-dev-plus-aosp
am:
8d3090466b
Change-Id: I673f011dd476e1825620e1eb1bcdf80f66540d23
Victor Chang [Thu, 14 Jul 2016 22:26:09 +0000 (22:26 +0000)]
Merge \\\"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\\\" into nyc-dev am:
488042fe3b am:
07e11c3ae9
am:
0e06694e35
Change-Id: I3a43e63966f48964af9a9a53fb33de7a995a21d8
Raph Levien [Thu, 14 Jul 2016 22:26:03 +0000 (22:26 +0000)]
Merge "Don't count zero width space in hasGlyph layout" into nyc-mr1-dev
Raph Levien [Thu, 14 Jul 2016 22:25:39 +0000 (22:25 +0000)]
Merge "Treat U+2695, U+2640, U+2642 as emoji characters." into nyc-mr1-dev
Raph Levien [Thu, 14 Jul 2016 22:25:20 +0000 (22:25 +0000)]
Merge "Delete gender-balanced emoji sequence by one backspace key event." into nyc-mr1-dev
OSDN Git Service
