drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
293,677 Commits 1 Branch 0 Tags
Commit Graph

293677 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daichi Hirono
a8f55f354d Merge "DO NOT MERGE: Fix NullPointerException in MtpManager." into nyc-mr1-dev 
am: dd443a0548

Change-Id: I57c3b7ab138f28bd8e74c039740f21bcd4376b73
 2016-10-18 17:35:23 +00:00
Sungsoo
9a15881184 DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba 
am: a5affb045e

Change-Id: I4bb4440c019839073b4fcf6df54d726a02286680
 2016-10-18 17:35:23 +00:00
Sungsoo
8be090868e DO NOT MERGE) ExifInterface: Close the file when an exception happens am: ad74e88f1d 
am: 41b775b40a  -s ours

Change-Id: I6ce63b74988fb4f87565be611a47c2f4a28cbc9b
 2016-10-18 17:35:22 +00:00
Daichi Hirono
6e6fdd4779 DO NOT MERGE: Fix NullPointerException in MtpManager. 
am: 9c8e0f1a54

Change-Id: I0a83b1dc39015b588759e50ff16db5deaa2f6093
 2016-10-18 17:35:21 +00:00
Sungsoo
e31a44b710 DO NOT MERGE) ExifInterface: Close the file when an exception happens am: cb17930077 
am: 761a1ed3a6

Change-Id: Ia6679d76895a452267f23dd71096c397c5b48c88
 2016-10-18 17:35:20 +00:00
Sungsoo
8e2451759d DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 135524f2c5 -s ours 
am: 02cd808ab8

Change-Id: Ic14a5adecb6fb0732a5b3c2a68a28fdcf1eb1bc4
 2016-10-18 17:35:16 +00:00
Sungsoo
a4ec9714b3 ExifInterfaceTest: Catch IOException 
am: c9ed3b8a5b

Change-Id: I589c7be846a9043ab0a7bbfb5e7775e9e595c0fd
 2016-10-18 17:31:12 +00:00
TreeHugger Robot
dd443a0548 Merge "DO NOT MERGE: Fix NullPointerException in MtpManager." into nyc-mr1-dev 2016-10-18 17:29:45 +00:00
Sungsoo
02cd808ab8 DO NOT MERGE) ExifInterface: Close the file when an exception happens 
am: 135524f2c5  -s ours

Change-Id: I34fc1b37171ad6ea5d79035df6c4730260a0b47b
 2016-10-18 17:29:03 +00:00
Sungsoo
761a1ed3a6 DO NOT MERGE) ExifInterface: Close the file when an exception happens 
am: cb17930077

Change-Id: I4b8f9270f75800e1390c3a840b41316c20ea4aa8
 2016-10-18 17:29:00 +00:00
Sungsoo
a5affb045e DO NOT MERGE) ExifInterface: Close the file when an exception happens 
am: 418e0869ba

Change-Id: Ifad08d681f67abc4dd9ad5d8c4e82b038cbd8322
 2016-10-18 17:28:58 +00:00
Sungsoo
41b775b40a DO NOT MERGE) ExifInterface: Close the file when an exception happens 
am: ad74e88f1d

Change-Id: Ic8a6e5b579c028a560436cdc6c3ca68a51cbf229
 2016-10-18 17:28:58 +00:00
Adrian Roos
593f9cdde0 Merge "DirectReply: fix lockscreen crash" into nyc-mr1-dev 
am: fe7cab6042

Change-Id: Ia9ae415a51f7a103c4af000e72ac2f2e93a92949
 2016-10-18 17:08:43 +00:00
Adrian Roos
dd8b2c943d DirectReply: fix lockscreen crash 
am: b22665db0c

Change-Id: I88a689d4fee7bcddcecccb32f48c0fb83bac0072
 2016-10-18 17:08:39 +00:00
Bryce Lee
ccd3468567 resolve merge conflicts of b1301fa to nyc-mr1-dev-plus-aosp 
Change-Id: Idb97adf36d981a340cdb5d24d4c3c3858d23e2fe
 2016-10-18 10:07:00 -07:00
TreeHugger Robot
fe7cab6042 Merge "DirectReply: fix lockscreen crash" into nyc-mr1-dev 2016-10-18 16:59:27 +00:00
TreeHugger Robot
04ad536e05 Merge "Iteration on findPath API." 2016-10-18 16:57:04 +00:00
Andreas Huber
ef1a565bd4 HIDL Vectors are now exposed to Java as ArrayList<T>, the supporting APIs on 
HwParcel now reflect this change.

Bug: 32237331
Test: hidl_test_java
Change-Id: Ia1ce5a4e3acedd8ebcff15107aea53ce28fde589
 2016-10-18 09:36:02 -07:00
Bryce Lee
112ae34fea Merge "Add a way to query for supported Bluetooth profiles." into cw-f-dev 2016-10-18 16:32:52 +00:00
Sungsoo
c9ed3b8a5b ExifInterfaceTest: Catch IOException 
ExifInterface throws IOException instead of UnsupportedOperationException.

Bug: 32221877
Change-Id: I68a4a62f565a386434b774759271bf6f2af2b7db
 2016-10-19 01:26:37 +09:00
Sungsoo
ad74e88f1d DO NOT MERGE) ExifInterface: Close the file when an exception happens 
Bug: 32068647, Bug: 30936376
Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f
 2016-10-18 16:18:35 +00:00
Sungsoo
135524f2c5 DO NOT MERGE) ExifInterface: Close the file when an exception happens 
Bug: 32068647, Bug: 30936376
Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f
 2016-10-18 16:18:15 +00:00
Sungsoo
418e0869ba DO NOT MERGE) ExifInterface: Close the file when an exception happens 
Bug: 32068647, Bug: 30936376
Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f
 2016-10-18 16:17:29 +00:00
Sungsoo
cb17930077 DO NOT MERGE) ExifInterface: Close the file when an exception happens 
Bug: 32068647, Bug: 30936376
Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f
 2016-10-19 01:14:51 +09:00
Wale Ogunwale
625ed0c302 Upgrade resize mode setting for home activities when restoring task 
We need to convert the resize mode of home activities saved before
version 1 of the persisted task record if they are marked as
RESIZE_MODE_RESIZEABLE to RESIZE_MODE_RESIZEABLE_VIA_SDK_VERSION
since we didn't have that differentiation before version 1 and the
system didn't resize home activities before then.

Bug: 30982291
Bug: 32231084
Test: Verify that a device runnin N upgraded to O doesn't resize the
home activity when in split-screen multi-window mode.

Change-Id: I3c9dfcc8be2651b06f7ab77abe4edb9653742952
 2016-10-18 09:00:53 -07:00
Philip P. Moltmann
ee53f0d419 Merge "Allow to select printer from info activity." 2016-10-18 14:55:51 +00:00
TreeHugger Robot
ef55c0048f Merge "Import translations. DO NOT MERGE" 2016-10-18 14:49:11 +00:00
Mike Reed
ca9b1ed9f0 Merge "use SkBlendMode instead of SkXfermode use sk_sp versions of paint setters/getters" 2016-10-18 13:57:13 +00:00
Jakub Adámek
621f568d51 Merge "Search for RRO both in SKU subdir and in vendor/overlay" into cw-f-dev am: ffacd81c23 
am: b38b015b7c

Change-Id: Ib9e3fb1bc9d152bfc62f004cb09cd5433302163e
 2016-10-18 08:01:48 +00:00
Jakub Adamek
3d39a99d9a Search for RRO both in SKU subdir and in vendor/overlay am: 1f36a2166b 
am: 27471b30de

Change-Id: I5c8655c5f9abe1375c0d53f48705709331d472d9
 2016-10-18 08:00:50 +00:00
Jakub Adámek
b38b015b7c Merge "Search for RRO both in SKU subdir and in vendor/overlay" into cw-f-dev 
am: ffacd81c23

Change-Id: If864d2b3cd0467b86b8b1a28152faf213276b3fb
 2016-10-18 07:54:25 +00:00
Jakub Adamek
27471b30de Search for RRO both in SKU subdir and in vendor/overlay 
am: 1f36a2166b

Change-Id: I3d3a3a5e7c9a39616c7289b6587717d6b37a3bf5
 2016-10-18 07:54:15 +00:00
Jakub Adámek
ffacd81c23 Merge "Search for RRO both in SKU subdir and in vendor/overlay" into cw-f-dev 2016-10-18 07:47:18 +00:00
Bill Yi
74f34c0479 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 92bd012829 -s ours am: ca6669ca12 -s ours 
am: ed64bfc1b9  -s ours

Change-Id: I93112c4986b0112b259dbc2585ddd7138dfab884
 2016-10-18 06:16:55 +00:00
Bill Yi
15b5e24303 Import translations. DO NOT MERGE am: ad231bd2f8 -s ours am: bcc44bd962 -s ours 
am: 0bfd6ae4c3  -s ours

Change-Id: I0f1b3a4b5aca1ffca6df97fb49ef0fde4780bba0
 2016-10-18 06:16:05 +00:00
Seigo Nonaka
9cd73b6828 Remove obsolete interface GetTable. 
Test: Manually done.

Change-Id: Ib9f50610454a6ddd7179c40d5f31c74916bcff84
 2016-10-18 15:10:21 +09:00
Bill Yi
c4e7e84ff6 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 61058919ca -s ours am: 29246c2795 -s ours 
am: 9e56c3b789  -s ours

Change-Id: Idb2c23fdd2fba229887d08fa65aaa839268af4a2
 2016-10-18 06:10:02 +00:00
Bill Yi
ed64bfc1b9 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 92bd012829 -s ours 
am: ca6669ca12  -s ours

Change-Id: I7c701e2fc2685429ace363283466cea3f5f9b3a9
 2016-10-18 06:10:00 +00:00
Bill Yi
d39419f461 Import translations. DO NOT MERGE am: c5a1d40bf1 -s ours am: 33b11b7822 -s ours 
am: 9731636e95  -s ours

Change-Id: I4106b5cfa6254c14b99228f5d5dc00d2583216ac
 2016-10-18 06:09:04 +00:00
Bill Yi
0bfd6ae4c3 Import translations. DO NOT MERGE am: ad231bd2f8 -s ours 
am: bcc44bd962  -s ours

Change-Id: I1e6de7917381292f0e75f453356675df8ec3d17b
 2016-10-18 06:09:03 +00:00
Bill Yi
ca6669ca12 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 92bd012829  -s ours

Change-Id: Ie361c190b2a67dfced753c8988766f81a374aca3
 2016-10-18 06:03:05 +00:00
Bill Yi
bcc44bd962 Import translations. DO NOT MERGE 
am: ad231bd2f8  -s ours

Change-Id: I9ffdc8e90d55d429ae96be3153497e8cc1231e22
 2016-10-18 06:03:03 +00:00
Bill Yi
a6ddf8fa6b Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: e8dc857c2f -s ours am: 28b2f5f023 -s ours 
am: 710ceed9fe  -s ours

Change-Id: Ic5e4617930be9856deb466718e1549a2677907e8
 2016-10-18 06:01:27 +00:00
Bill Yi
5b6f14e2e4 Import translations. DO NOT MERGE am: c11e301ca4 -s ours am: d648bf6c97 -s ours 
am: d958623eed  -s ours

Change-Id: Iad5badc883973c56a56fb5f08030367b6be05c98
 2016-10-18 06:00:31 +00:00
Bill Yi
954ab05970 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: a74148ea54 -s ours 
am: c36373f2c4  -s ours

Change-Id: If4bb675fd474325584631c64102d32f10963fec8
 2016-10-18 05:59:44 +00:00
Bill Yi
23cc5c6fe1 Import translations. DO NOT MERGE am: 00afe024b9 -s ours 
am: f94ea63942  -s ours

Change-Id: I40c2584bde88d03b1e48b9b383c59e7d4089d560
 2016-10-18 05:58:55 +00:00
Bill Yi
9e56c3b789 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 61058919ca -s ours 
am: 29246c2795  -s ours

Change-Id: Ia19c295cc0f1273d5d68e4a7ee89d7cc0151a46f
 2016-10-18 05:58:02 +00:00
Bill Yi
2a919d7820 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fb27d02b6b -s ours 
am: bf6671f401  -s ours

Change-Id: I52173a50fff40020cb759cb208ec228114dc7f52
 2016-10-18 05:58:01 +00:00
TreeHugger Robot
92bd012829 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-10-18 05:57:11 +00:00
Bill Yi
9731636e95 Import translations. DO NOT MERGE am: c5a1d40bf1 -s ours 
am: 33b11b7822  -s ours

Change-Id: I59d5fd7a7d1bbc4c07bb0582b95f6ec2c8ceb4ca
 2016-10-18 05:57:06 +00:00