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
227a176508 Merge "Fix missing dependency on R.java" 2016-09-01 05:32:48 +00:00
Andrew Solovay
0b423e5eae docs: Typo fix in multi-window docs 
Referred to the "android:resizableActivity" property; should
have been "android:resizeableactivity". English prose, however,
consistently uses the (preferred) spelling "resizable".

See first comment for stage location.

bug: 30566808
Change-Id: I2570ff9269b4d2dc8b11f1c98817e50726be78fc
 2016-08-31 19:37:25 -07:00
Andrew Solovay
9499478c80 Merge "docs: Fixing formatting problem" into nyc-dev 2016-09-01 02:21:49 +00:00
Colin Cross
c558dd9597 Fix missing dependency on R.java 
Compiling frameworks source is missing a dependency on the R.stamp file
generated by the frameworks-res aapt rule, likely caused by the switch
to jack.  Use LOCAL_ADDITONAL_DEPENDENCIES to insert the dependency
instead of directly using build system internals.

Change-Id: Ifb830da18b3607f87ae283cea04f7d276d4bfde9
 2016-08-31 18:01:06 -07:00
Cheryl Potter
780395fd85 docs: fixing gpu debugger redirect 
b/31227713

Change-Id: Ia0e7e4d26940dc98ab735df3068dc2dda22b1f58
 2016-08-31 17:43:37 -07:00
Cheryl Potter
3f2d7d8e22 docs: Add redirects for new help buttons (Create Java Class, GPU Debugger, more) 
b/31158856
b/31157097
b/31158502

Change-Id: Id3178127e0267936c58f47cd7da7348202051fa3
 2016-08-31 16:00:42 -07:00
Mark Lu
656fde1875 docs: update docs for the multiprocess attribute in provider element 
Bug: 7625079
Change-Id: I671c703c91fc5623ebc3d0645cb7017eb285d27b
 2016-08-31 12:55:22 -07:00
Jakub Pawlowski
9f341e4e49 Merge "Separate advertiser from GATT client (1/4)" am: 5f87c4539a 
am: 40a16ea242

Change-Id: I0d08f623e78fdd779b39083d0da3a45aee72ff3c
 2016-08-31 18:21:00 +00:00
Jakub Pawlowski
40a16ea242 Merge "Separate advertiser from GATT client (1/4)" 
am: 5f87c4539a

Change-Id: I0cc39d08fdef8637e156414e3ef4e669a01f921f
 2016-08-31 18:14:17 +00:00
Jakub Pawlowski
5f87c4539a Merge "Separate advertiser from GATT client (1/4)" 2016-08-31 18:05:27 +00:00
Chih-hung Hsieh
842f1e48e7 Merge "Fix google-explicit-constructor warnings in libs/hwui." am: 7207562ff7 
am: d7a69e04eb

Change-Id: I78ea5c2e7036c5d5c7f5573b4eef208b0ff93b99
 2016-08-31 17:39:44 +00:00
Chih-hung Hsieh
d7a69e04eb Merge "Fix google-explicit-constructor warnings in libs/hwui." 
am: 7207562ff7

Change-Id: I746697717344af1663b47906580489c7ebc5c379
 2016-08-31 17:34:41 +00:00
Chih-hung Hsieh
edd824b94a Merge "Fix google-explicit-constructor warnings in media/mca." am: 2cace65f71 
am: 4836d07980

Change-Id: Ib0369e46dd1f1e56b3f660e615bc34c87120acaa
 2016-08-31 17:34:11 +00:00
Chih-hung Hsieh
4836d07980 Merge "Fix google-explicit-constructor warnings in media/mca." 
am: 2cace65f71

Change-Id: I4eb234c60ce33f34e91b40661736231237c472b2
 2016-08-31 17:27:58 +00:00
Svetoslav Ganov
84763eb770 Merge "Properly close fd backing a MemoryIntArray" into nyc-dev 2016-08-31 17:25:30 +00:00
Chih-hung Hsieh
7207562ff7 Merge "Fix google-explicit-constructor warnings in libs/hwui." 2016-08-31 17:18:56 +00:00
Chih-hung Hsieh
2cace65f71 Merge "Fix google-explicit-constructor warnings in media/mca." 2016-08-31 17:18:29 +00:00
Svetoslav Ganov
e257d6e167 Properly close fd backing a MemoryIntArray 
Use ParcelFileDescriptor only as an IPC transport
to make sure MemoryIntArray manges its backing fd.

Bug:30310689

Change-Id: Ib3cc13ef4ae2a744e5f7a96099570e0431847bce
(cherry picked from commit fe2462f3a6)
 2016-08-31 16:45:17 +00:00
Neil Fuller
ef1fb4889a Merge "Fix receive timeout on LocalSocket" am: 7a9c0cd854 
am: 680ec020a1

Change-Id: I9b5622a91cf459844ee3513191b45994d51c86a7
 2016-08-31 16:43:22 +00:00
Neil Fuller
680ec020a1 Merge "Fix receive timeout on LocalSocket" 
am: 7a9c0cd854

Change-Id: I4148f467921ad6a627fe8ebc5225e2de6717270f
 2016-08-31 16:35:24 +00:00
Neil Fuller
7a9c0cd854 Merge "Fix receive timeout on LocalSocket" 2016-08-31 16:28:17 +00:00
Sergio Giro
61c0996d6f Merge "java.security.Principal: add default method Principal#implies" am: 0c8c4a5d98 
am: e639bbd7d0

Change-Id: I4fa9f37094b3679868732b93eab2dfe1e6429d7d
 2016-08-31 14:15:46 +00:00
Sergio Giro
e639bbd7d0 Merge "java.security.Principal: add default method Principal#implies" 
am: 0c8c4a5d98

Change-Id: I4708b9cee5059b588e829853264484782e251efb
 2016-08-31 14:09:42 +00:00
Sergio Giro
d4b193c30c Merge "java.security.SecretKey: now extends from Destroyable" am: c7bd0d0adc 
am: 8a5790a287

Change-Id: Icebe2f83f4532c5ad57fe385d365c93732d97145
 2016-08-31 14:04:09 +00:00
Sergio Giro
8a5790a287 Merge "java.security.SecretKey: now extends from Destroyable" 
am: c7bd0d0adc

Change-Id: I3382bd7f225e6a487dbf4b6aa74000981f40a70e
 2016-08-31 13:58:11 +00:00
Sergio Giro
0c8c4a5d98 Merge "java.security.Principal: add default method Principal#implies" 2016-08-31 13:51:37 +00:00
Sergio Giro
c7bd0d0adc Merge "java.security.SecretKey: now extends from Destroyable" 2016-08-31 13:50:23 +00:00
Sergio Giro
e04c029ed5 Merge "java.security: update java.security.KeyStore to jdk8u60" am: d53ae2c285 
am: 565c1fbf8b

Change-Id: Iec116355209c0770b4125142f93873766e29d61d
 2016-08-31 12:42:32 +00:00
Sergio Giro
565c1fbf8b Merge "java.security: update java.security.KeyStore to jdk8u60" 
am: d53ae2c285

Change-Id: I22c2ac6b7afcd590864a7a27cd68cc13c8b9da7d
 2016-08-31 12:31:33 +00:00
Sergio Giro
d53ae2c285 Merge "java.security: update java.security.KeyStore to jdk8u60" 2016-08-31 12:24:48 +00:00
Edward Savage-Jones
2dce6281e6 Fix WallpaperManager APIs 
When support for lockscreen wallpapers was added in API level 24 the
behaviour for earlier API versions changed. Calls to the old 'set' APIs
no longer affect the overall device wallpaper, and can result in an end
user not being able to change their lockscreen wallpaper.

This upload restores the original API behaviour.

Bug: 31204228
Change-Id: Ia16d2e2e379c54d798eef8f5c653099c2c581d78
 2016-08-31 13:43:25 +02:00
Jakub Pawlowski
a480f7fe28 Separate advertiser from GATT client (1/4) 
Bug: 30622771
Change-Id: I08c0498f8a1ea04423d3e864e9a60c7c78f1dbad
 2016-08-31 03:36:53 -07:00
Neil Fuller
a8280a5d34 Fix receive timeout on LocalSocket 
The receive timeout stopped being set incorrect due to commit
c80af6d8. There is an associated CTS regression test in cts/.

Test: Ran CTS test android.net.cts.LocalSocketTest
Bug: 31205169
Change-Id: I99808478946f8eae502c49d2cb83465648b9c904
 2016-08-31 11:32:17 +01:00
Sergio Giro
0ac5c50850 Merge "java.security.cert: update classes in java.security.cert (part 2)" am: 9484bff017 
am: 47f7d8384b

Change-Id: Ib1384141da63cae9341335b79dc585267073c4bb
 2016-08-31 08:31:17 +00:00
Sergio Giro
47f7d8384b Merge "java.security.cert: update classes in java.security.cert (part 2)" 
am: 9484bff017

Change-Id: Idb12e10674a34ebfd3cf0236cc8cbde1979e5cb7
 2016-08-31 08:26:25 +00:00
Sergio Giro
9484bff017 Merge "java.security.cert: update classes in java.security.cert (part 2)" 2016-08-31 08:18:57 +00:00
Scott Main
a06f40bd05 Merge "replace the N Preview landing page with the redirect to the package index also update version metadata (no longer preview, now 7.0)" into nyc-dev 2016-08-31 03:06:10 +00:00
Mark Lu
ae0459f532 docs: update javadoc description for View.setVisibility() method 
Bug: 19770068
 2016-08-30 17:51:22 -07:00
Mark Lu
1e20208d90 docs: Update docs for SQLiteDatabase replace methods 
- Mention that if the row does not exist, the method performs insert
- Add parameter info for initialValues. It was incomplete

Bug: 2321632
 2016-08-30 17:41:25 -07:00
Mark Lu
e8691d19cb docs: fix grammar mistake in TextureView 
Bug: 6441115
 2016-08-30 17:38:42 -07:00
Mark Lu
193879a8b6 docs: Add param info to TextView.setTextColor 
Bug: 6617101
 2016-08-30 17:36:52 -07:00
Kevin Hufnagle
4d215ad49c docs: Wi-Fi settings example now uses Settings constant correctly 
The constant ACTION_WIFI_SETTINGS is part of the Settings class, not
the Intent class. An example intent for opening settings has been
changed to reflect this class structure.

Bug: 17464977
Change-Id: I160354a11392ad001c127525983a1b84a4dfbe00
 2016-08-30 17:24:20 -07:00
Adam Seaton
f11acea915 Revert "Bump up the uncrypt timeout to 30 min." Creates Null Build to test OTA failure fix. This reverts commit 8abcfed8a4. am: b57e6560d0 
am: e245037327

Change-Id: Ib46ce4c0e12a313f3b376634a85ae1050d655c34
 2016-08-30 23:39:04 +00:00
Adam Seaton
e245037327 Revert "Bump up the uncrypt timeout to 30 min." Creates Null Build to test OTA failure fix. This reverts commit 8abcfed8a4. 
am: b57e6560d0

Change-Id: Idaafcb7c835aa7b7b83bb7382900ef3d18fa551f
 2016-08-30 23:15:49 +00:00
Jason Monk
f06c51a3ea Merge "Backup system QS tiles DO NOT MERGE" into nyc-dev 
am: a845535045

Change-Id: Ib38430d968e20db46abac87c4efbb045c335d193
 2016-08-30 22:50:14 +00:00
Jason Monk
297d238130 Backup system QS tiles DO NOT MERGE 
am: 37bd2be160

Change-Id: I5d291b5ee504acf40386cbce4edaf5b20a1a3d3d
 2016-08-30 22:50:10 +00:00
Chih-hung Hsieh
c80db139b3 Merge "Fix google-explicit-constructor warnings in soundpool." am: feee33ce2c 
am: 17f1fc6c76

Change-Id: If968940949e97633e99832a3edc1d3003662dac2
 2016-08-30 22:41:26 +00:00
TreeHugger Robot
a845535045 Merge "Backup system QS tiles DO NOT MERGE" into nyc-dev 2016-08-30 22:30:16 +00:00
Chih-hung Hsieh
17f1fc6c76 Merge "Fix google-explicit-constructor warnings in soundpool." 
am: feee33ce2c

Change-Id: Id3cf418900b7eb3ac2e3d94f674f4ed6f624ba27
 2016-08-30 22:29:05 +00:00
Chih-hung Hsieh
feee33ce2c Merge "Fix google-explicit-constructor warnings in soundpool." 2016-08-30 22:21:34 +00:00