OSDN Git Service
Adarsh Fernando [Tue, 24 May 2016 18:54:50 +0000 (18:54 +0000)]
Docs: Changed URL references of relocated test_framework.png am:
b4c6f2b637 am:
9b81008076 am:
7932d67607
am:
8dc27182df
* commit '
8dc27182df596cf7ad77c507965880f7f85e2a69':
Docs: Changed URL references of relocated test_framework.png
Change-Id: I34a946fbc104f37bcd1a28abe13596f4180ab3a6
Android Build Merger (Role) [Tue, 24 May 2016 18:45:06 +0000 (18:45 +0000)]
Merge "Merge "Use correct synchronization lock" into nyc-dev am:
638cc6cac9 am:
23ef1f7653" into nyc-mr1-dev-plus-aosp
Adarsh Fernando [Tue, 24 May 2016 18:44:41 +0000 (18:44 +0000)]
Docs: Changed URL references of relocated test_framework.png am:
b4c6f2b637 am:
9b81008076
am:
7932d67607
* commit '
7932d676071e36b88a4105515cfb81c255398dd8':
Docs: Changed URL references of relocated test_framework.png
Change-Id: Ifbfdcb353bf4b7100af20c0f0d784274945df2aa
Amith Yamasani [Tue, 24 May 2016 18:44:38 +0000 (18:44 +0000)]
Merge "Use correct synchronization lock" into nyc-dev am:
638cc6cac9
am:
23ef1f7653
* commit '
23ef1f7653a792492fd5c64a786480b0a7b4e934':
Use correct synchronization lock
Change-Id: Ife205c9b527546edab562bd936fb2649cb26e3c2
Amith Yamasani [Tue, 24 May 2016 18:38:58 +0000 (18:38 +0000)]
Merge "Use correct synchronization lock" into nyc-dev am:
638cc6cac9
am:
32257dbb4d
* commit '
32257dbb4dffb680445d6a18a7418fb95cf63171':
Use correct synchronization lock
Change-Id: Ia95571c01a08d2eed39f1c4a6b0266578578956a
Felipe Leme [Tue, 24 May 2016 18:29:50 +0000 (18:29 +0000)]
Merge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev am:
efd3a1749f
am:
964914602b
* commit '
964914602b4a62a72e448b0ad7109fea9115ac0e':
Change-Id: I34481e18cf75a8715d7169ce72c8affd5b86c79b
Amith Yamasani [Tue, 24 May 2016 18:29:50 +0000 (18:29 +0000)]
Merge "Use correct synchronization lock" into nyc-dev
am:
638cc6cac9
* commit '
638cc6cac9e35ec5a1410ba2fd63550b53e699ab':
Use correct synchronization lock
Change-Id: I834766e3191a2bc4cef1587714522031fe3f24de
Amith Yamasani [Tue, 24 May 2016 18:29:45 +0000 (18:29 +0000)]
Merge "Use correct synchronization lock" into nyc-dev
am:
638cc6cac9
* commit '
638cc6cac9e35ec5a1410ba2fd63550b53e699ab':
Use correct synchronization lock
Change-Id: Ibc7475f21c585ae457412214986cc14ac9ecbe8b
Adarsh Fernando [Tue, 24 May 2016 18:25:31 +0000 (18:25 +0000)]
Docs: Changed URL references of relocated test_framework.png am:
b4c6f2b637
am:
9b81008076
* commit '
9b810080769b26b1aecd97b96b3a1ffcd69341c1':
Docs: Changed URL references of relocated test_framework.png
Change-Id: Ibcd8728ed898c32cac19eeff5ab55cb919acc14d
Felipe Leme [Tue, 24 May 2016 18:23:58 +0000 (18:23 +0000)]
Merge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev am:
efd3a1749f
am:
223d4fff18
* commit '
223d4fff18002369fdc716ee2109f3e949563964':
Fixed enforceMeteredApnPolicy when Data Saver is on.
Change-Id: I62eb108dfad2ac1ffd2b541470f01a7923d92731
Android Build Merger (Role) [Tue, 24 May 2016 18:13:38 +0000 (18:13 +0000)]
Merge "Merge "Register change Uri and notify changes in bugreportServices." into nyc-dev am:
5d5ddfa80e am:
6d80e074ec" into nyc-mr1-dev-plus-aosp
Felipe Leme [Tue, 24 May 2016 18:13:16 +0000 (18:13 +0000)]
Merge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev
am:
efd3a1749f
* commit '
efd3a1749f2737199643cc29bea6132a9786223b':
Fixed enforceMeteredApnPolicy when Data Saver is on.
Change-Id: I87b596346c058c7ac8efbebb67b43664f1be0fed
Felipe Leme [Tue, 24 May 2016 18:13:14 +0000 (18:13 +0000)]
Merge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev
am:
efd3a1749f
* commit '
efd3a1749f2737199643cc29bea6132a9786223b':
Fixed enforceMeteredApnPolicy when Data Saver is on.
Change-Id: I5cd9701e6620abcc950f6a182b6e2b5f95127371
Ben Lin [Tue, 24 May 2016 18:13:14 +0000 (18:13 +0000)]
Merge "Register change Uri and notify changes in bugreportServices." into nyc-dev am:
5d5ddfa80e
am:
6d80e074ec
* commit '
6d80e074ec7c20e1e6a10fd67a4d409990f76fcb':
Register change Uri and notify changes in bugreportServices.
Change-Id: Ic0e793c959ca9061e3367f2808205234ade908d7
Ben Lin [Tue, 24 May 2016 18:11:46 +0000 (18:11 +0000)]
Merge "Register change Uri and notify changes in bugreportServices." into nyc-dev am:
5d5ddfa80e
am:
9c14d14f43
* commit '
9c14d14f43caff0497c5c1edfa63527575a6f083':
Register change Uri and notify changes in bugreportServices.
Change-Id: I9b77e4eb8b7d699a97a265244bb808f17c07e259
Adarsh Fernando [Tue, 24 May 2016 18:11:43 +0000 (18:11 +0000)]
Docs: Changed URL references of relocated test_framework.png
am:
b4c6f2b637
* commit '
b4c6f2b63713c958e46b02b6c520271ec77fdda2':
Docs: Changed URL references of relocated test_framework.png
Change-Id: Ief551478b2fa023cdea013c766017e3bc0eba79e
Amith Yamasani [Tue, 24 May 2016 18:10:56 +0000 (18:10 +0000)]
Merge "Use correct synchronization lock" into nyc-dev
Ben Lin [Tue, 24 May 2016 18:01:34 +0000 (18:01 +0000)]
Merge "Register change Uri and notify changes in bugreportServices." into nyc-dev
am:
5d5ddfa80e
* commit '
5d5ddfa80ecb482e34ed4bfebae2c7308269a1c4':
Register change Uri and notify changes in bugreportServices.
Change-Id: I02eadb5e4c4b7735bf3f1ac142e75a513f12ca85
Ben Lin [Tue, 24 May 2016 18:01:16 +0000 (18:01 +0000)]
Merge "Register change Uri and notify changes in bugreportServices." into nyc-dev
am:
5d5ddfa80e
* commit '
5d5ddfa80ecb482e34ed4bfebae2c7308269a1c4':
Register change Uri and notify changes in bugreportServices.
Change-Id: Ic118dd61f0471f61af3fe5fbace8a0dbae258484
TreeHugger Robot [Tue, 24 May 2016 17:51:35 +0000 (17:51 +0000)]
Merge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev
Eric Laurent [Tue, 24 May 2016 17:50:29 +0000 (17:50 +0000)]
Merge "Fix AudioTrack and AudioRecord documentation" into nyc-dev am:
b143e3de34
am:
a30335698c
* commit '
a30335698c1d9c7c34fa09f5f2af2f62f353eb9c':
Change-Id: I0cd478c8b1c3dd7b00d9d7a0ab0d159eb1a4c11e
Ben Lin [Tue, 24 May 2016 17:48:22 +0000 (17:48 +0000)]
Merge "Register change Uri and notify changes in bugreportServices." into nyc-dev
Eric Laurent [Tue, 24 May 2016 17:43:36 +0000 (17:43 +0000)]
Merge "Fix AudioTrack and AudioRecord documentation" into nyc-dev am:
b143e3de34
am:
50103561d2
* commit '
50103561d24dfa2b0c2d7e64b719d43351505ca3':
Fix AudioTrack and AudioRecord documentation
Change-Id: Iaab599f5e3c9edf1cf127264a7602f463dc219c5
Eric Laurent [Tue, 24 May 2016 17:43:34 +0000 (17:43 +0000)]
Merge "Fix AudioTrack and AudioRecord documentation" into nyc-dev
am:
b143e3de34
* commit '
b143e3de34ab98463a641fd6d67165fce878f1ff':
Fix AudioTrack and AudioRecord documentation
Change-Id: I861c0047b33730465c3ceeae1c4072f17b29d804
Chong Zhang [Tue, 24 May 2016 17:43:29 +0000 (17:43 +0000)]
Merge "Fix wallpaper crop during unlock animation" into nyc-dev am:
d4a45e0c40
am:
863289d2cd
* commit '
863289d2cd0243f133ccec750f8ac9bebab84bf1':
Change-Id: I77962256318c3eb0955e0a529c81d93ee1e6181f
Eric Laurent [Tue, 24 May 2016 17:33:13 +0000 (17:33 +0000)]
Merge "Fix AudioTrack and AudioRecord documentation" into nyc-dev
am:
b143e3de34
* commit '
b143e3de34ab98463a641fd6d67165fce878f1ff':
Fix AudioTrack and AudioRecord documentation
Change-Id: I2fe322e51f6a7dc548d8f7964fae033b14219b02
Chong Zhang [Tue, 24 May 2016 17:32:54 +0000 (17:32 +0000)]
Merge "Fix wallpaper crop during unlock animation" into nyc-dev
am:
d4a45e0c40
* commit '
d4a45e0c40b46e3d57617a91dbb0a9dc4412208c':
Fix wallpaper crop during unlock animation
Change-Id: I06518707f4a1d4661f0e039f3a9f4778ae3f4a1b
Chong Zhang [Tue, 24 May 2016 17:30:46 +0000 (17:30 +0000)]
Merge "Fix wallpaper crop during unlock animation" into nyc-dev am:
d4a45e0c40
am:
d2b0d2e231
* commit '
d2b0d2e231dc09231e5bfe52ae42b7f16e7f03c2':
Fix wallpaper crop during unlock animation
Change-Id: I215425d36b6bf8822c91809e8ff7fbd635b5eb11
Dianne Hackborn [Tue, 24 May 2016 17:22:34 +0000 (17:22 +0000)]
Merge "Work on issue #
27995384: Time in the top bar different..." into nyc-dev am:
cdcc53d007
am:
45c02ee9d5
* commit '
45c02ee9d5046bf9b03681c2c888e015ce8ddfa9':
Change-Id: I29f35223c04d9d1afe4c8b5511f1a04cf53821ee
Chong Zhang [Tue, 24 May 2016 17:21:30 +0000 (17:21 +0000)]
Merge "Fix wallpaper crop during unlock animation" into nyc-dev
am:
d4a45e0c40
* commit '
d4a45e0c40b46e3d57617a91dbb0a9dc4412208c':
Fix wallpaper crop during unlock animation
Change-Id: I862e208435365cd8c0639beab8e4eaee5fee8b45
Dianne Hackborn [Tue, 24 May 2016 17:15:18 +0000 (17:15 +0000)]
Merge "Work on issue #
27995384: Time in the top bar different..." into nyc-dev am:
cdcc53d007
am:
6d8d2a0330
* commit '
6d8d2a0330b7519eda98fc6244c637423c74dfdc':
Work on issue #
27995384: Time in the top bar different...
Change-Id: Ia87353d83a3952c2cc90f979431a071d8b7f076a
Eric Laurent [Tue, 24 May 2016 17:15:10 +0000 (17:15 +0000)]
Merge "Fix AudioTrack and AudioRecord documentation" into nyc-dev
Chong Zhang [Tue, 24 May 2016 17:09:08 +0000 (17:09 +0000)]
Merge "Fix wallpaper crop during unlock animation" into nyc-dev
Dianne Hackborn [Tue, 24 May 2016 17:09:00 +0000 (17:09 +0000)]
Merge "Work on issue #
27995384: Time in the top bar different..." into nyc-dev
am:
cdcc53d007
* commit '
cdcc53d007d613ccfcf3a36ce22fa6823c5fe954':
Work on issue #
27995384: Time in the top bar different...
Change-Id: If1f18d7c56bbe56353319b2f394f90121f050fc7
Dianne Hackborn [Tue, 24 May 2016 17:08:38 +0000 (17:08 +0000)]
Merge "Work on issue #
27995384: Time in the top bar different..." into nyc-dev
am:
cdcc53d007
* commit '
cdcc53d007d613ccfcf3a36ce22fa6823c5fe954':
Work on issue #
27995384: Time in the top bar different...
Change-Id: Ia10ef2de16cf3ce18fa8a8ff3ddbbe05d9fe39d1
Dianne Hackborn [Tue, 24 May 2016 16:56:00 +0000 (16:56 +0000)]
Merge "Work on issue #
27995384: Time in the top bar different..." into nyc-dev
Adarsh Fernando [Tue, 24 May 2016 16:42:41 +0000 (09:42 -0700)]
Docs: Changed URL references of relocated test_framework.png
Change-Id: I45458480fd07fc9da7ad74a6fc04b5ccebd8d463
Vasco Brito [Tue, 24 May 2016 16:24:29 +0000 (16:24 +0000)]
Merge "Add free short codes for Direct Carrier Billing." am:
8b5bbbbfa4 am:
72813ddd5b
am:
c676119e15
* commit '
c676119e1563b38b6e8a00a7cf05833064897578':
Add free short codes for Direct Carrier Billing.
Change-Id: Ic91d00213bc2d8781ba4bf548f1dbeeebee46403
Android Build Merger (Role) [Tue, 24 May 2016 16:19:58 +0000 (16:19 +0000)]
Merge "media: add missing levels in CodecProfileLevel and fix limits am:
2a4001ee62 am:
59f656bee1" into nyc-mr1-dev-plus-aosp
Robert Greenwalt [Tue, 24 May 2016 16:19:31 +0000 (16:19 +0000)]
Merge "Add free short codes for Direct Carrier Billing." am:
8b5bbbbfa4
am:
72813ddd5b
* commit '
72813ddd5b63f91ba8b3e84b511c7683a10de885':
Add free short codes for Direct Carrier Billing.
Change-Id: I9c1d62bc3be22504e66218342ab18cf436952d88
Lajos Molnar [Tue, 24 May 2016 16:19:24 +0000 (16:19 +0000)]
media: add missing levels in CodecProfileLevel and fix limits am:
2a4001ee62
am:
59f656bee1
* commit '
59f656bee1ef63e00fab9d3c467a55d47f3ef3ca':
media: add missing levels in CodecProfileLevel and fix limits
Change-Id: Id95f58b13e0305e8242371e9e8ab48dd2d10abf3
Lajos Molnar [Tue, 24 May 2016 16:19:18 +0000 (16:19 +0000)]
media: add missing levels in CodecProfileLevel and fix limits am:
2a4001ee62
am:
01df627536
* commit '
01df6275360203e4edcda1730b35d559343b150f':
media: add missing levels in CodecProfileLevel and fix limits
Change-Id: I54aa60ee7f67bc289d22f94d39e19489070f5588
Lajos Molnar [Tue, 24 May 2016 16:07:24 +0000 (16:07 +0000)]
media: add missing levels in CodecProfileLevel and fix limits
am:
2a4001ee62
* commit '
2a4001ee62f3374d7fffed72d71f77c5a833c331':
media: add missing levels in CodecProfileLevel and fix limits
Change-Id: Ibfcfb720cd1503e4318ebcd14dc29749a535038c
Lajos Molnar [Tue, 24 May 2016 16:07:21 +0000 (16:07 +0000)]
media: add missing levels in CodecProfileLevel and fix limits
am:
2a4001ee62
* commit '
2a4001ee62f3374d7fffed72d71f77c5a833c331':
media: add missing levels in CodecProfileLevel and fix limits
Change-Id: Iea860639751956dce3efd833e9bac36daefe3110
Vasco Brito [Tue, 24 May 2016 16:07:19 +0000 (16:07 +0000)]
Merge "Add free short codes for Direct Carrier Billing."
am:
8b5bbbbfa4
* commit '
8b5bbbbfa4318401dd074440250850ec14c0264c':
Add free short codes for Direct Carrier Billing.
Change-Id: I9ca55ccf48217f9aede7c8cc25c94070bc39e5df
Robert Greenwalt [Tue, 24 May 2016 15:57:09 +0000 (15:57 +0000)]
Merge "Add free short codes for Direct Carrier Billing."
Lajos Molnar [Tue, 24 May 2016 14:27:21 +0000 (07:27 -0700)]
media: add missing levels in CodecProfileLevel and fix limits
Bug:
28671284
Change-Id: Ie4a91f5639ce8f1c5ac825ec829ac82e695d18b5
Android Build Merger (Role) [Tue, 24 May 2016 14:03:33 +0000 (14:03 +0000)]
Merge "Set autobundled summary color. am:
3011fd4dbd am:
d31e42a52f" into nyc-mr1-dev-plus-aosp
Julia Reynolds [Tue, 24 May 2016 14:03:07 +0000 (14:03 +0000)]
Set autobundled summary color. am:
3011fd4dbd
am:
d31e42a52f
* commit '
d31e42a52fb20ed207345defceb4c45c60c0ffd5':
Set autobundled summary color.
Change-Id: I60470d34535ee5c30dedbcfd2b313b984c583547
Julia Reynolds [Tue, 24 May 2016 14:03:03 +0000 (14:03 +0000)]
Set autobundled summary color. am:
3011fd4dbd
am:
40a3d53178
* commit '
40a3d5317805434dacbd671d6d1ccb9207df90b7':
Set autobundled summary color.
Change-Id: Ieae2a6fb1beb9edb7caf20569358e80582123224
Julia Reynolds [Tue, 24 May 2016 13:58:22 +0000 (13:58 +0000)]
Set autobundled summary color.
am:
3011fd4dbd
* commit '
3011fd4dbd4585917af71e109353e6e02332ef5b':
Set autobundled summary color.
Change-Id: I69c940d018ccd41769437c2e711ab07b7a7b369d
Julia Reynolds [Tue, 24 May 2016 13:58:18 +0000 (13:58 +0000)]
Set autobundled summary color.
am:
3011fd4dbd
* commit '
3011fd4dbd4585917af71e109353e6e02332ef5b':
Set autobundled summary color.
Change-Id: Ic903b346211ae89d0cd531eae98e1d90138c385c
Julia Reynolds [Fri, 20 May 2016 14:25:43 +0000 (10:25 -0400)]
Set autobundled summary color.
Change-Id: I8ceb0b045359dc364fcec411fcfc610f7f57d8db
Fixes:
28615262
Android Build Merger (Role) [Tue, 24 May 2016 13:49:50 +0000 (13:49 +0000)]
Merge "Merge "QS: Don\'t cause click noise when opening from QQS" into nyc-dev am:
8a1561a772 am:
9458057c9b" into nyc-mr1-dev-plus-aosp
Jason Monk [Tue, 24 May 2016 13:49:19 +0000 (13:49 +0000)]
Merge "QS: Don\'t cause click noise when opening from QQS" into nyc-dev am:
8a1561a772
am:
9458057c9b
* commit '
9458057c9b688e65d506ed4fabdc76a955aeddf9':
QS: Don't cause click noise when opening from QQS
Change-Id: I03360671df14a68f50b2e4c0de255cb737a2206a
Jason Monk [Tue, 24 May 2016 13:49:17 +0000 (13:49 +0000)]
Merge "QS: Don\'t cause click noise when opening from QQS" into nyc-dev am:
8a1561a772
am:
f6d3295a7b
* commit '
f6d3295a7b953d435b260c69a240d76854916f28':
QS: Don't cause click noise when opening from QQS
Change-Id: I4de4dfebfc96fe9e8eb916cb983301e858364299
Jason Monk [Tue, 24 May 2016 13:43:47 +0000 (13:43 +0000)]
Merge "QS: Don\'t cause click noise when opening from QQS" into nyc-dev
am:
8a1561a772
* commit '
8a1561a772e735b41b48dfb91269b620b5125602':
QS: Don't cause click noise when opening from QQS
Change-Id: Id28b2b808be11f5ebf23b7c8fac749aed1aa0493
Jason Monk [Tue, 24 May 2016 13:43:42 +0000 (13:43 +0000)]
Merge "QS: Don\'t cause click noise when opening from QQS" into nyc-dev
am:
8a1561a772
* commit '
8a1561a772e735b41b48dfb91269b620b5125602':
QS: Don't cause click noise when opening from QQS
Change-Id: I6cd5281ab021be51ad92c86edc9e39b62188c713
Jason Monk [Tue, 24 May 2016 13:35:02 +0000 (13:35 +0000)]
Merge "QS: Don't cause click noise when opening from QQS" into nyc-dev
Android Build Merger (Role) [Tue, 24 May 2016 13:27:28 +0000 (13:27 +0000)]
Merge "Merge "Set accessibility string for suspended widgets." into nyc-dev am:
7b4b2fbc0a am:
7185fc8cc3" into nyc-mr1-dev-plus-aosp
Kenny Guy [Tue, 24 May 2016 13:27:01 +0000 (13:27 +0000)]
Merge "Set accessibility string for suspended widgets." into nyc-dev am:
7b4b2fbc0a
am:
7185fc8cc3
* commit '
7185fc8cc3266ad713a4f19791dec5b7a06e57e0':
Set accessibility string for suspended widgets.
Change-Id: Ice17a4983d11a49d260ca6082f85d03908694e5f
Kenny Guy [Tue, 24 May 2016 13:26:56 +0000 (13:26 +0000)]
Merge "Set accessibility string for suspended widgets." into nyc-dev am:
7b4b2fbc0a
am:
d7d4203050
* commit '
d7d420305094d8e267c8fc3cee5ab2252bf1280c':
Set accessibility string for suspended widgets.
Change-Id: I26a41681436009fb1fc6fc57c102539be0096687
Kenny Guy [Tue, 24 May 2016 13:20:31 +0000 (13:20 +0000)]
Merge "Set accessibility string for suspended widgets." into nyc-dev
am:
7b4b2fbc0a
* commit '
7b4b2fbc0afd9cff3d4bb647b0ed7dc79ab747dc':
Set accessibility string for suspended widgets.
Change-Id: Idc35229ca5da9b460c0b806b3833196d66c48499
Kenny Guy [Tue, 24 May 2016 13:20:25 +0000 (13:20 +0000)]
Merge "Set accessibility string for suspended widgets." into nyc-dev
am:
7b4b2fbc0a
* commit '
7b4b2fbc0afd9cff3d4bb647b0ed7dc79ab747dc':
Set accessibility string for suspended widgets.
Change-Id: Iedafb99a35224a37e816c510284ebfc01fe3c87d
Kenny Guy [Tue, 24 May 2016 13:11:11 +0000 (13:11 +0000)]
Merge "Set accessibility string for suspended widgets." into nyc-dev
Mahaver Chopra [Tue, 24 May 2016 12:30:44 +0000 (12:30 +0000)]
Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev
am:
dd86aa141e
* commit '
dd86aa141e02ffaf277996fc1701141ea13e090e':
Disallow OEM unlock when DISALLOW_FACTORY_RESET applies
Change-Id: I077fd5c067c453a4dcd161ba582e473ade1a8392
Mahaver Chopra [Tue, 24 May 2016 12:22:49 +0000 (12:22 +0000)]
Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev
Sergio Giro [Tue, 24 May 2016 12:18:31 +0000 (12:18 +0000)]
Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" am:
393b67d65f am:
163f8a2e91
am:
d767eba969
* commit '
d767eba969531b2df1ed41d82dac0853dce67cce':
ZygoteInit: install AndroidKeyStoreProvider in the Zygote
Change-Id: I78cfc9155ab1ab43b4c8280f57f877b551882b9b
Sergio Giro [Tue, 24 May 2016 12:14:18 +0000 (12:14 +0000)]
Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" am:
393b67d65f
am:
163f8a2e91
* commit '
163f8a2e9132b60f86f28a352ded1db6a38d367e':
ZygoteInit: install AndroidKeyStoreProvider in the Zygote
Change-Id: Ibb6a051e31bb52c246be990fe79495f1f7252b9f
Sergio Giro [Tue, 24 May 2016 12:06:25 +0000 (12:06 +0000)]
Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote"
am:
393b67d65f
* commit '
393b67d65fdbf4565cbec2f40fcabaaf87143dfd':
ZygoteInit: install AndroidKeyStoreProvider in the Zygote
Change-Id: Idc8e1ca4ae2160285fe56995290c241c3a7288f2
Mahaver Chopra [Tue, 17 May 2016 17:53:09 +0000 (18:53 +0100)]
Disallow OEM unlock when DISALLOW_FACTORY_RESET applies
Bug:
28339424
Change-Id: I4b6dc6f186ea60a13e778f52d574e615b0b19b74
Sergio Giro [Tue, 24 May 2016 11:56:50 +0000 (11:56 +0000)]
Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote"
Android Build Merger (Role) [Tue, 24 May 2016 10:51:37 +0000 (10:51 +0000)]
Merge "Merge "Load WebView even if WebView relro creation times out." into nyc-dev am:
a2fbfbce9e am:
a44129dd55" into nyc-mr1-dev-plus-aosp
Gustav Sennton [Tue, 24 May 2016 10:51:01 +0000 (10:51 +0000)]
Merge "Load WebView even if WebView relro creation times out." into nyc-dev am:
a2fbfbce9e
am:
a44129dd55
* commit '
a44129dd5518c1890f2301baea7e03972408e270':
Load WebView even if WebView relro creation times out.
Change-Id: I5f0a0df8a08eafcfa10d63597c9ce8af3496c900
Gustav Sennton [Tue, 24 May 2016 10:50:56 +0000 (10:50 +0000)]
Merge "Load WebView even if WebView relro creation times out." into nyc-dev am:
a2fbfbce9e
am:
930ad20ef4
* commit '
930ad20ef492a02994ad8efec9821c0fb46e5ba2':
Load WebView even if WebView relro creation times out.
Change-Id: I043822e0eb95fb540d68a903ed87855c1340f70b
Gustav Sennton [Tue, 24 May 2016 10:46:29 +0000 (10:46 +0000)]
Merge "Load WebView even if WebView relro creation times out." into nyc-dev
am:
a2fbfbce9e
* commit '
a2fbfbce9ef09ed7a98222e67709aa086e548c79':
Load WebView even if WebView relro creation times out.
Change-Id: Iae015c9bc199836db71553cbbcea7d8842eb8dda
Gustav Sennton [Tue, 24 May 2016 10:46:16 +0000 (10:46 +0000)]
Merge "Load WebView even if WebView relro creation times out." into nyc-dev
am:
a2fbfbce9e
* commit '
a2fbfbce9ef09ed7a98222e67709aa086e548c79':
Load WebView even if WebView relro creation times out.
Change-Id: Icf6e99e3f3dfc9b1f4244f5da63e32b3d741459c
Gustav Sennton [Tue, 24 May 2016 10:39:31 +0000 (10:39 +0000)]
Merge "Load WebView even if WebView relro creation times out." into nyc-dev
Android Build Merger (Role) [Tue, 24 May 2016 03:22:44 +0000 (03:22 +0000)]
Merge "Merge "Support IPv6 multicast filtering in APF." into nyc-dev am:
d954c6368f am:
09a2690f91" into nyc-mr1-dev-plus-aosp
Lorenzo Colitti [Tue, 24 May 2016 03:22:15 +0000 (03:22 +0000)]
Merge "Support IPv6 multicast filtering in APF." into nyc-dev am:
d954c6368f
am:
09a2690f91
* commit '
09a2690f91b32a6be57d92ced7e13ee6b683ed24':
Support IPv6 multicast filtering in APF.
Change-Id: I68e937bbeab2285528b5fed7a298daaf5500f924
Lorenzo Colitti [Tue, 24 May 2016 03:22:11 +0000 (03:22 +0000)]
Merge "Support IPv6 multicast filtering in APF." into nyc-dev am:
d954c6368f
am:
50282f0cb7
* commit '
50282f0cb7bbdd117cb31db3b127adb0f4f196a0':
Support IPv6 multicast filtering in APF.
Change-Id: I58cb62ff0bb5304d614b8eb61da148c6a5d94bed
Lorenzo Colitti [Tue, 24 May 2016 03:19:32 +0000 (03:19 +0000)]
Merge "Support IPv6 multicast filtering in APF." into nyc-dev
am:
d954c6368f
* commit '
d954c6368fc6e591385e608fa6ebb42dc7606074':
Support IPv6 multicast filtering in APF.
Change-Id: I99641c19b2b0014d313e281070d5888a3759588f
Lorenzo Colitti [Tue, 24 May 2016 03:19:29 +0000 (03:19 +0000)]
Merge "Support IPv6 multicast filtering in APF." into nyc-dev
am:
d954c6368f
* commit '
d954c6368fc6e591385e608fa6ebb42dc7606074':
Support IPv6 multicast filtering in APF.
Change-Id: I6123c2390aa9641652fd200adcc16f9724799aab
Lorenzo Colitti [Tue, 24 May 2016 03:14:37 +0000 (03:14 +0000)]
Merge "Support IPv6 multicast filtering in APF." into nyc-dev
Android Build Merger (Role) [Tue, 24 May 2016 02:39:30 +0000 (02:39 +0000)]
Merge "Reduced the impact of "synchronized" statements am:
eb50a39e98 am:
c6a3503100" into nyc-mr1-dev-plus-aosp
Pavlin Radoslavov [Tue, 24 May 2016 02:38:31 +0000 (02:38 +0000)]
Reduced the impact of "synchronized" statements am:
eb50a39e98
am:
c6a3503100
* commit '
c6a35031005c24eaa2e6592218d3e653ff623668':
Reduced the impact of "synchronized" statements
Change-Id: I87af74e9dd74f18cac98144763a866a847bbfe21
Pavlin Radoslavov [Tue, 24 May 2016 02:38:29 +0000 (02:38 +0000)]
Reduced the impact of "synchronized" statements am:
eb50a39e98
am:
13b1a15db0
* commit '
13b1a15db07b2187b8a134f54e574e2c6a76dadc':
Reduced the impact of "synchronized" statements
Change-Id: I84d731281a7424a6d9fe4ae633f47a97a0446aa7
Pavlin Radoslavov [Tue, 24 May 2016 02:34:28 +0000 (02:34 +0000)]
Reduced the impact of "synchronized" statements
am:
eb50a39e98
* commit '
eb50a39e98acb78d16465041bb5c172aa1637e97':
Reduced the impact of "synchronized" statements
Change-Id: I60a4b0e656b283f83c49c3c0211943b4854867e0
Pavlin Radoslavov [Tue, 24 May 2016 02:34:23 +0000 (02:34 +0000)]
Reduced the impact of "synchronized" statements
am:
eb50a39e98
* commit '
eb50a39e98acb78d16465041bb5c172aa1637e97':
Reduced the impact of "synchronized" statements
Change-Id: I272dba69e9011720356a3c5b9ca849de281f5027
Suprabh Shukla [Tue, 24 May 2016 02:31:46 +0000 (02:31 +0000)]
Merge "Adding RetailModeService to handle retail mode" into nyc-mr1-dev
am:
a09c9e0fc4
* commit '
a09c9e0fc48816096349aac8960a3b49101d90a3':
Adding RetailModeService to handle retail mode
Change-Id: I8ac04712c319eeb4ff8087ea828331bdb0450867
TreeHugger Robot [Tue, 24 May 2016 02:24:49 +0000 (02:24 +0000)]
Merge "Adding RetailModeService to handle retail mode" into nyc-mr1-dev
Pavlin Radoslavov [Mon, 23 May 2016 05:16:41 +0000 (22:16 -0700)]
Reduced the impact of "synchronized" statements
* Removed "synchronized" statements that are not needed
* Replaced "synchronized" statements with Read/Write lock as
appropriate. The lock protects the access to and the setting of
BluetoothAdapter.mService and BluetoothManagerService.mBluetooth and
associated state.
Bug:
28734075
Bug:
28799467
Change-Id: I8f8281c505f0a1ae0add1e14a3caba1f5b2a98e4
Suprabh Shukla [Fri, 20 May 2016 21:41:22 +0000 (14:41 -0700)]
Adding RetailModeService to handle retail mode
The service listens for the global setting DEVICE_DEMO_MODE and switches
device to demo mode when it is changed to 1. Also, acquires the wakelock
to
keep the screen on and puts up a notification to wipe and reset the demo
session when in demo mode.
Bug:
27280140
Change-Id: If1843016889ec2c50818c67432d60f33063e0986
Dianne Hackborn [Tue, 24 May 2016 00:39:23 +0000 (00:39 +0000)]
Merge "Fix issue #
28868955: CTS: PendingIntentTest failures; Regressed in NRD48x" into nyc-dev am:
9c252700f6
am:
f7003f512f
* commit '
f7003f512f055614c1e297c9c19192a68cbf6794':
Change-Id: Ie93c870ac3c79820e1dc59aad08956fc159bf9c8
Eric Laurent [Mon, 23 May 2016 19:41:50 +0000 (12:41 -0700)]
Fix AudioTrack and AudioRecord documentation
Improve documentation for error codes returned by
AudioTrack.write() and AudioRecord.read() methods.
Fix native to JAVA error code conversion in JNI.
Bug:
28906466
Change-Id: I4d48b1d428834b7a39a14e2d81b6c164696817a8
Jaewan Kim [Tue, 24 May 2016 00:35:36 +0000 (00:35 +0000)]
Merge "PIP: Handle configuration changes" into nyc-dev am:
75822138ad
am:
74ebf3ec67
* commit '
74ebf3ec67ddbbf7752da120a57c4624d4e1655f':
Fix issue #
28868955: CTS: PendingIntentTest failures; Regressed in NRD48x
Change-Id: I6c01fb9689735a6214bd9f3b29d4dd50a8744388
Android Build Merger (Role) [Tue, 24 May 2016 00:31:05 +0000 (00:31 +0000)]
Merge "Merge "PIP: Handle configuration changes" into nyc-dev am:
75822138ad am:
938c4e3564" into nyc-mr1-dev-plus-aosp
Jaewan Kim [Tue, 24 May 2016 00:30:38 +0000 (00:30 +0000)]
Merge "PIP: Handle configuration changes" into nyc-dev am:
75822138ad
am:
b917a0e6be
* commit '
b917a0e6be841d23ff56c54b03abb42b3a93d930':
PIP: Handle configuration changes
Change-Id: I018fc45368eff5fbe9ba5d6f21b00d616e622010
Dianne Hackborn [Tue, 24 May 2016 00:30:32 +0000 (00:30 +0000)]
Merge "Fix issue #
28868955: CTS: PendingIntentTest failures; Regressed in NRD48x" into nyc-dev
am:
9c252700f6
* commit '
9c252700f6686767f5418677800ba171f441dddc':
Fix issue #
28868955: CTS: PendingIntentTest failures; Regressed in NRD48x
Change-Id: Ib2811fb49299da93459066d9d6312d403681eed4
Jaewan Kim [Tue, 24 May 2016 00:30:32 +0000 (00:30 +0000)]
Merge "PIP: Handle configuration changes" into nyc-dev am:
75822138ad
am:
938c4e3564
* commit '
938c4e356417360e161dcf7a9eba2524f13373f0':
PIP: Handle configuration changes
Change-Id: Ida8a222a813f462e3b6766c572d53ffcf7995e78
OSDN Git Service
