Commit Graph

277484 Commits

Author SHA1 Message Date
Dan Albert
bea90f6e72 Merge changes from topic 'libandroid-ndk_headers' am: 00a19a37db am: c2c9caa71e
am: ca68d73d58

Change-Id: I25c030fa891ebd199c68128457722a33cf2967fd
2016-09-28 03:59:05 +00:00
Dan Albert
cf0dad72e6 Move libjnigraphics to ndk_library. am: 7ce8df32a7 am: 15ccfb32ff
am: 60156b8573

Change-Id: I00fdcf5d9debde5d3467a5b7346b70a38cc03541
2016-09-28 03:53:56 +00:00
Dan Albert
ca68d73d58 Merge changes from topic 'libandroid-ndk_headers' am: 00a19a37db
am: c2c9caa71e

Change-Id: I4f7b74ab00e0c04da23874c4816a167abd0bd70e
2016-09-28 03:53:40 +00:00
Dan Albert
8bc96a32f9 Migrate libandroid.so to ndk_library. am: 2a8d9c20bd am: e7ee5cd043
am: b4720e6de2

Change-Id: I033be52422d53af716523b18f8a76a9d15a65e28
2016-09-28 03:53:08 +00:00
Dan Albert
c2c9caa71e Merge changes from topic 'libandroid-ndk_headers'
am: 00a19a37db

Change-Id: I0cabe907b999e5ea14ec1ff3cebb739b99b6a764
2016-09-28 03:48:17 +00:00
Dan Albert
60156b8573 Move libjnigraphics to ndk_library. am: 7ce8df32a7
am: 15ccfb32ff

Change-Id: Ib32e5f1ecc49fa2cc98f7208f811d405a6e78eb3
2016-09-28 03:45:03 +00:00
Dan Albert
b4720e6de2 Migrate libandroid.so to ndk_library. am: 2a8d9c20bd
am: e7ee5cd043

Change-Id: Id991d13c769e77951ca238126aaa09a3e1576b86
2016-09-28 03:44:04 +00:00
Dan Albert
15ccfb32ff Move libjnigraphics to ndk_library.
am: 7ce8df32a7

Change-Id: I1eb9e19b6a270a9b24bdff9a5a86a06a1a8d197f
2016-09-28 03:39:23 +00:00
Dan Albert
e7ee5cd043 Migrate libandroid.so to ndk_library.
am: 2a8d9c20bd

Change-Id: Iaa9b5929b542307e5c95f1e7fe1d4d275189e683
2016-09-28 03:38:22 +00:00
Treehugger Robot
00a19a37db Merge changes from topic 'libandroid-ndk_headers'
* changes:
  Move libjnigraphics to ndk_library.
  Migrate libandroid.so to ndk_library.
2016-09-28 03:32:56 +00:00
Sungsoo
f97c5955b2 ExifInterface: Update javadoc for saveAttributes am: abf5b4cbf3 am: d0a8a69034 am: 0a31d58d14 am: 4e236046ae
am: 1bb6822cd0

Change-Id: Iba5b443d2dd510f389c6b1948d550a0ba5d72e89
2016-09-28 00:35:22 +00:00
Sungsoo
1bb6822cd0 ExifInterface: Update javadoc for saveAttributes am: abf5b4cbf3 am: d0a8a69034 am: 0a31d58d14
am: 4e236046ae

Change-Id: Ia180fcbaaf1083c11c29188cbf1aae1c0e9c6886
2016-09-28 00:28:19 +00:00
Sungsoo
4e236046ae ExifInterface: Update javadoc for saveAttributes am: abf5b4cbf3 am: d0a8a69034
am: 0a31d58d14

Change-Id: I33726dd0a1bf2f30309e4abd74b8633c809afada
2016-09-28 00:22:55 +00:00
Sungsoo
855b9126e1 ExifInterface: Update javadoc for saveAttributes am: abf5b4cbf3 am: d0a8a69034
am: 6e8eba7238

Change-Id: Ifffb86693778c77a57b2a22387495c0d6cbd1e12
2016-09-28 00:22:53 +00:00
Sungsoo
6e8eba7238 ExifInterface: Update javadoc for saveAttributes am: abf5b4cbf3
am: d0a8a69034

Change-Id: I1d3369e609d668dc402d4b30eb0c4247980e6e47
2016-09-28 00:18:44 +00:00
Salvador Martinez
6860f3f388 Merge "Changed themes for core activities" into nyc-mr1-dev am: c43f05e669
am: d7772a562c

Change-Id: I8df79a7226792d09e1fa7b1dd19acc3c5865a6b4
2016-09-28 00:17:47 +00:00
Vadim Tryshev
aed92d0547 Fixing html glitch in drag/drop docs.
Bug: 31702571
Change-Id: Id00baac3c9c16f6dc7145a920ec9659d63ebab2a
2016-09-27 17:17:07 -07:00
Salvador Martinez
32a87ca7a9 Changed themes for core activities am: 7e2657c303
am: f3209d6c87

Change-Id: I1595ffd9a91137666e45792f8f980355ea622f50
2016-09-28 00:16:50 +00:00
Sungsoo
0a31d58d14 ExifInterface: Update javadoc for saveAttributes am: abf5b4cbf3
am: d0a8a69034

Change-Id: I4df5b4855ec9f1e38fab504f3a895c4744cc287e
2016-09-28 00:15:51 +00:00
Salvador Martinez
d7772a562c Merge "Changed themes for core activities" into nyc-mr1-dev
am: c43f05e669

Change-Id: I4cda794530cd0abe6b00aed72bb6f7e6eb258f42
2016-09-28 00:08:58 +00:00
Salvador Martinez
f3209d6c87 Changed themes for core activities
am: 7e2657c303

Change-Id: If4019d7f37ea13bbbcbaeaaccde40a112173683c
2016-09-28 00:08:55 +00:00
Sungsoo
d0a8a69034 ExifInterface: Update javadoc for saveAttributes
am: abf5b4cbf3

Change-Id: Icdd289f513f2a576b50d0f3ddf278a1c1710d8b5
2016-09-28 00:08:52 +00:00
TreeHugger Robot
c43f05e669 Merge "Changed themes for core activities" into nyc-mr1-dev 2016-09-28 00:04:00 +00:00
Teng-Hui Zhu
bb12929470 Update JavaDoc about animatable on VectorDrawable
b/31782834

Change-Id: I64279fd14841302caaa71c817feaf01b855126ad
2016-09-27 16:56:35 -07:00
Greg Kaiser
42de4dd1aa Merge "ContextHubService: Hack around 32-bit app ID" into nyc-mr1-dev am: a97c9617ae
am: 43e4df0517

Change-Id: I2182d8d1a82d1fa729d1251df2d88ec6f9eaa5be
2016-09-27 23:55:28 +00:00
Greg Kaiser
eaed84e40a ContextHubService: Hack around 32-bit app ID am: 1983f9b05b
am: 40c0435026

Change-Id: Ie8594f39ea791fc1beaed1bff9274526d98338dc
2016-09-27 23:54:37 +00:00
Christopher Tate
13934df5d2 Merge "Don't leak wakelock instances" into nyc-mr1-dev am: 121a9941d4
am: f411051195

Change-Id: I006e62e81156ba31dc245fee9bcfbea43edd71b0
2016-09-27 23:53:43 +00:00
Christopher Tate
5f00f298bf Don't leak wakelock instances am: 4b17e984b6
am: cea6cc9d33

Change-Id: I908ad297251b1abd8b8502059a53363cf3be9af2
2016-09-27 23:50:20 +00:00
Greg Kaiser
43e4df0517 Merge "ContextHubService: Hack around 32-bit app ID" into nyc-mr1-dev
am: a97c9617ae

Change-Id: I9dbfb6b90c90f37c744632c4fa22417f4c1de3d0
2016-09-27 23:46:11 +00:00
Greg Kaiser
40c0435026 ContextHubService: Hack around 32-bit app ID
am: 1983f9b05b

Change-Id: I9b87a8f35d2f97dcea4bbd73fd2783e1ece26d33
2016-09-27 23:46:08 +00:00
Christopher Tate
f411051195 Merge "Don't leak wakelock instances" into nyc-mr1-dev
am: 121a9941d4

Change-Id: I64c849823281500fc8b9ecf760e162d1a2a92d65
2016-09-27 23:44:53 +00:00
Christopher Tate
cea6cc9d33 Don't leak wakelock instances
am: 4b17e984b6

Change-Id: I952939e1d7e7b7f3ddfff7ecdfb7f3ca70bd9b70
2016-09-27 23:44:51 +00:00
Etan Cohen
f085c1951a [NAN] Use a hidden class for peer ID opaque handle
Results in clearer run-time exception (relatively to using Integer).

(cherry-pick of commit 57db2b3eea)

Bug: 31689166
Test: unit-tests + integrated (sl4a).
Change-Id: I79d0e8061204834b9775b02d503cb18fd03ed8c6
2016-09-27 16:42:05 -07:00
Greg Kaiser
a97c9617ae Merge "ContextHubService: Hack around 32-bit app ID" into nyc-mr1-dev 2016-09-27 23:41:44 +00:00
TreeHugger Robot
121a9941d4 Merge "Don't leak wakelock instances" into nyc-mr1-dev 2016-09-27 23:37:57 +00:00
Selim Cinek
ecfc6b52ec Fixed a bug where the scroller would stop tracking
Because we were not scrolling anymore in the QS area the shade
could become stuck and scrolled in too much.

Change-Id: I2c517d0a8da35230d0510c2a6b0e817d8d3567af
Fixes: 31440725
2016-09-27 16:31:21 -07:00
Andrew Solovay
b032c2f558 Merge "docs: Removed support libraries from API Guide TOC" into nyc-dev am: c7c7c20b2f am: 6789896f2d am: 97c0ad4401
am: 3e440ed80e

Change-Id: I6f98de2d059b0545f2b3597984b1eb9bfc786150
2016-09-27 23:13:10 +00:00
Andrew Solovay
276ec70b8a docs: Removed support libraries from API Guide TOC am: 61f956cc25 am: 06c6d90437 am: 34c0653b22
am: 10951aa8e9

Change-Id: I2cfe604de0078d90b46d041021d2e3c10070aa37
2016-09-27 23:12:17 +00:00
Andrew Solovay
3e440ed80e Merge "docs: Removed support libraries from API Guide TOC" into nyc-dev am: c7c7c20b2f am: 6789896f2d
am: 97c0ad4401

Change-Id: I77c51b55e4ed664552bb38b6a0fb34500b7cc52f
2016-09-27 23:08:38 +00:00
Andrew Solovay
10951aa8e9 docs: Removed support libraries from API Guide TOC am: 61f956cc25 am: 06c6d90437
am: 34c0653b22

Change-Id: I930020a2ac3e4ad59ee98d98fe2b60e51f28fd82
2016-09-27 23:07:43 +00:00
Andrew Solovay
f7d37a956e Merge "docs: Removed support libraries from API Guide TOC" into nyc-dev am: c7c7c20b2f
am: 2ab0ae4eb6

Change-Id: Ied1e0b827ce66182e06b66b1e65d0a28d6e0e7c8
2016-09-27 23:03:14 +00:00
Andrew Solovay
97c0ad4401 Merge "docs: Removed support libraries from API Guide TOC" into nyc-dev am: c7c7c20b2f
am: 6789896f2d

Change-Id: I9f87882ff67784285225db361e24739ed3b5d509
2016-09-27 23:03:09 +00:00
Andrew Solovay
34c0653b22 docs: Removed support libraries from API Guide TOC am: 61f956cc25
am: 06c6d90437

Change-Id: Ie6d17de7ecd7f3a41814afb391d61be1a265f962
2016-09-27 23:02:17 +00:00
Andrew Solovay
7b6a1f08c3 docs: Removed support libraries from API Guide TOC am: 61f956cc25
am: c390412350

Change-Id: Ibafb56af9f0f48528abca5898eed72a6a16f06d7
2016-09-27 23:02:16 +00:00
Andrew Solovay
2ab0ae4eb6 Merge "docs: Removed support libraries from API Guide TOC" into nyc-dev
am: c7c7c20b2f

Change-Id: I895fd121618cd78c7b46ba2eb047294179b4a4bc
2016-09-27 22:58:00 +00:00
Andrew Solovay
c390412350 docs: Removed support libraries from API Guide TOC
am: 61f956cc25

Change-Id: Ie6bb20af4af2370ef820613b92e9c6053d761ad2
2016-09-27 22:57:56 +00:00
Andrew Solovay
6789896f2d Merge "docs: Removed support libraries from API Guide TOC" into nyc-dev
am: c7c7c20b2f

Change-Id: I2e081c2183087e25f1c722ab4717a89da84bd9dd
2016-09-27 22:57:52 +00:00
Andrew Solovay
06c6d90437 docs: Removed support libraries from API Guide TOC
am: 61f956cc25

Change-Id: I1d8ccea474531a3ce4dcaa7d261f3cff62cf4302
2016-09-27 22:57:49 +00:00
Andrew Solovay
c7c7c20b2f Merge "docs: Removed support libraries from API Guide TOC" into nyc-dev 2016-09-27 22:52:31 +00:00
Jordan Liu
705cbc763f Add dial_string_replace key to CarrierConfig
Add KEY_DIAL_STRING_REPLACE_STRING_ARRAY and default value (null) to
CarrierConfigManager, and remove the references to the old config in
core/res/res/values/[config.xml/symbols.xml]

This value exists to fix http://b/17202092. We specify a map from
dialstrings to replacements for roaming network service numbers which
cannot be replaced on the carrier side.

Merged-In: I852261596d3931f38d5f1c6b3d24ffe27f950458

Bug: 29873049
Change-Id: I99d97bb25ef57c178d004ae17d97a6c7672734e2
2016-09-27 15:35:27 -07:00