Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
255,075 Commits 3 Branches 0 Tags
bcbed91c2fd96fbe96c8d2633c0c6ecb4e2df481
Commit Graph

255075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
f0aa998233 Merge "Rerun of update-api with no changes" 2016-09-28 17:41:53 +00:00
Andreas Huber
0f7eb16fad Merge "Adds static methods HwBlob.WrapArray(<scalar-type>[] scalarArray)" am: 90acbd86ac 
am: 2849ee8b75

Change-Id: I00d47819095dd8b52dae52f3d55d6b3bc9998aaf
 2016-09-28 17:36:31 +00:00
Andreas Huber
2849ee8b75 Merge "Adds static methods HwBlob.WrapArray(<scalar-type>[] scalarArray)" 
am: 90acbd86ac

Change-Id: Ia3013237296ccca46e3f4e0bc702b4ae90a7ea3a
 2016-09-28 17:30:23 +00:00
Treehugger Robot
90acbd86ac Merge "Adds static methods HwBlob.WrapArray(<scalar-type>[] scalarArray)" 2016-09-28 17:16:52 +00:00
ryang
3734e98095 Merge "hwui: Fix the length of partial updates system property" am: faf945a773 
am: 73f2e9b812

Change-Id: Ibcc55a59fd29614e491843a0dbbcfd316f423312
 2016-09-28 17:04:26 +00:00
ryang
73f2e9b812 Merge "hwui: Fix the length of partial updates system property" 
am: faf945a773

Change-Id: I2f98f29446c9a303e72f0ff6a3ddd2612e369c0a
 2016-09-28 16:58:57 +00:00
Treehugger Robot
faf945a773 Merge "hwui: Fix the length of partial updates system property" 2016-09-28 16:47:03 +00:00
yuanhuihui
20a5fe414e Merge "fix persistent process is killed and restart again and again" am: ae302cef52 
am: b322dc384e

Change-Id: Ie1802af0a6f22cb69c3b62f0912363a299f8f453
 2016-09-28 16:36:47 +00:00
yuanhuihui
b322dc384e Merge "fix persistent process is killed and restart again and again" 
am: ae302cef52

Change-Id: I31ead1fe09561e69df0cd94f366b2ef4648b29f3
 2016-09-28 16:30:25 +00:00
Treehugger Robot
ae302cef52 Merge "fix persistent process is killed and restart again and again" 2016-09-28 16:20:56 +00:00
Neil Fuller
4c1d37b2a0 Unhide constants related to type annotations 
Type annotations are supported in the compiler, but not the
Android runtime. Unhiding these is therefore still
reasonable.

Bug: 30391692
Test: make droid
Change-Id: I39db1099918fe3bd6321f2d755a988cb73f657c6
 2016-09-28 16:57:59 +01:00
Neil Fuller
0543f71b82 Fix AnnotatedElement.getDeclaredAnnotation() generic signature 
To match upstream OpenJDK 8.

Bug: 31108290
Test: make droid
Change-Id: Icdf54eb65b8d89ee474ec51eab552ceb3fc6d8ec
 2016-09-28 16:56:49 +01:00
Neil Fuller
b36fad8a5f Rerun of update-api with no changes 
Picks up a small change to Parameter.

Looks like it was caused by a mid-air collision between
commit 3ead539c01, which
introduced Parameter, and commit
b4fcc6136e which
introduced improvements to generics in the .txt file.

Test: make droid
Change-Id: If1c11e9303d17854ab1e5559c9a412cc6de54685
 2016-09-28 16:51:03 +01:00
Etan Cohen
a96c6e222b Merge "[NAN] Use a hidden class for peer ID opaque handle" am: e43c1a3e3e 
am: 66741c2c0f

Change-Id: I5cef0e013ff9ca49216cc1e6c8208353f2d063f4
 2016-09-28 05:20:02 +00:00
Etan Cohen
66741c2c0f Merge "[NAN] Use a hidden class for peer ID opaque handle" 
am: e43c1a3e3e

Change-Id: Iac94c4b27f7bfc89c1b1f7779760512ee2a11e31
 2016-09-28 05:14:30 +00:00
Etan Cohen
e43c1a3e3e Merge "[NAN] Use a hidden class for peer ID opaque handle" 2016-09-28 05:04:06 +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
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
6e8eba7238 ExifInterface: Update javadoc for saveAttributes am: abf5b4cbf3 
am: d0a8a69034

Change-Id: I1d3369e609d668dc402d4b30eb0c4247980e6e47
 2016-09-28 00:18:44 +00:00
Sungsoo
d0a8a69034 ExifInterface: Update javadoc for saveAttributes 
am: abf5b4cbf3

Change-Id: Icdd289f513f2a576b50d0f3ddf278a1c1710d8b5
 2016-09-28 00:08:52 +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
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
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
Jordan Liu
cf99a8e2e9 Merge "Add key to CarrierConfig" am: 154c22d2d4 
am: fda7370ddd

Change-Id: I7b33003443e9f9bf173f6ec7e3942bed2c6714a5
 2016-09-27 22:28:48 +00:00
Jordan Liu
fda7370ddd Merge "Add key to CarrierConfig" 
am: 154c22d2d4

Change-Id: I5355f13efb084c0785bcce60ef327dc4bc436fe2
 2016-09-27 22:24:23 +00:00
Jordan Liu
154c22d2d4 Merge "Add key to CarrierConfig" 2016-09-27 22:19:26 +00:00
Peter Qiu
601964b927 wifi: add test target/directory for unit testing WiFi framework APIs 
The existing tests for the WiFi frameworks API android.net.wifi are
copied from frameworks/opt/wifi/tests, and will be removed in
frameworks/opt/wifi/tests.

Bug: 31745421
Change-Id: I789e983bc7dd02b6c3fa6a982ca671347912be0f
Test: frameworks/base/wifi/runtests.sh
 2016-09-27 15:13:20 -07:00
Eric Schmidt
53fd017571 Merge "docs: Update BroadcastReceiver docs for performance" into nyc-dev 
am: d780260f10

Change-Id: I92a2059fb0c580bdb762e8b16d7230441ca859f7
 2016-09-27 21:52:03 +00:00
Eric Schmidt
113cdca9fd docs: Update BroadcastReceiver docs for performance 
am: 8cf3c1b532

Change-Id: I7c6647a7cf1be2f9af42c8f087916f7692dab2d5
 2016-09-27 21:51:57 +00:00
Eric Schmidt
20e5ac3951 Merge "docs: Adding Espresso Intent and Web docs" into nyc-dev 
am: f4dbb4091b

Change-Id: Ic8fad4eb41031461a7446eec573e7cc034e0e4f1
 2016-09-27 21:50:24 +00:00
Eric Schmidt
d1b0367221 docs: Adding Espresso Intent and Web docs 
am: 34fb906c1a

Change-Id: Ie925f354e1ceea1df4fee210759538ef1df58036
 2016-09-27 21:50:19 +00:00
Eric Schmidt
d780260f10 Merge "docs: Update BroadcastReceiver docs for performance" into nyc-dev 2016-09-27 21:42:06 +00:00
Eric Schmidt
f4dbb4091b Merge "docs: Adding Espresso Intent and Web docs" into nyc-dev 2016-09-27 21:41:43 +00:00
Dan Albert
7ce8df32a7 Move libjnigraphics to ndk_library. 
The headers are already migrated because they're in
frameworks/native/include/android, which was covered when migrating
libandroid.

Test: make native
Bug: http://b/30465923
Change-Id: I610dc6c613f2a408960088a86629073da38682a0
 2016-09-27 13:59:05 -07:00
Dan Albert
2a8d9c20bd Migrate libandroid.so to ndk_library. 
Test: make native
Bug: http://b/30465923
Change-Id: I956b5014c4da4dce1ce28da706b9d868eba4cce3
 2016-09-27 13:59:04 -07:00
Andrew Solovay
3e8cf83163 Merge "docs: Redirect for /preview/setup-sdk.html" into nyc-dev 
am: 156d5fd88e

Change-Id: Ied7f37838c2ecb2b71348c99de36bf8764063731
 2016-09-27 20:41:16 +00:00
Andrew Solovay
87460c5325 docs: Redirect for /preview/setup-sdk.html 
am: 572d710ba3

Change-Id: I49f154e21a0f3e74a709755ce8f3bd77adba159a
 2016-09-27 20:41:12 +00:00
Tianjie Xu
036d08638e Log the error when uncrypt timeouts 
Log the error code to uncrypt_status if uncrypt gets killed because
of timeout.

Test: We log the error code correctly in uncrypt_status when uncrypt timeouts.
Bug: 31603820
Change-Id: Ia623c333714295e68f4269257fbb4297a867e42b
 2016-09-27 13:34:58 -07:00
Andrew Solovay
156d5fd88e Merge "docs: Redirect for /preview/setup-sdk.html" into nyc-dev 2016-09-27 20:31:49 +00:00
Eric Schmidt
34fb906c1a docs: Adding Espresso Intent and Web docs 
Bug: 20721203
Bug: 20720633
bug: 27453733
Change-Id: I67a7d09a6652e3463728691f2a1f5679e900e776
 2016-09-27 13:19:43 -07:00
Etan Cohen
fb43e8509b Merge "[NAN] Rename setTerminateNotificationEnabled per API review" am: 5d74bf9f95 
am: 62be010f2a

Change-Id: I9354e65db8144c01bfbe748f3661f633d5a06c70
 2016-09-27 20:06:56 +00:00
Etan Cohen
62be010f2a Merge "[NAN] Rename setTerminateNotificationEnabled per API review" 
am: 5d74bf9f95

Change-Id: I435c5377d7897cee20bba7a352eb55e85e996673
 2016-09-27 20:02:00 +00:00
Etan Cohen
5d74bf9f95 Merge "[NAN] Rename setTerminateNotificationEnabled per API review" 2016-09-27 19:50:44 +00:00