Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
196,704 Commits 3 Branches 0 Tags
38f1d726a885cca306e0514f2f7151caa1eddffe
Commit Graph

53071 Commits

Author SHA1 Message Date
Alex Klyubin
38f1d726a8 am 738241f9: Merge "Document that DownloadManager supports HTTPS." into mnc-dev 
* commit '738241f93c066a2ef233dd0e12661bf808bfd915':
  Document that DownloadManager supports HTTPS.
 2015-06-12 16:12:01 +00:00
Alex Klyubin
738241f93c Merge "Document that DownloadManager supports HTTPS." into mnc-dev 2015-06-12 16:02:17 +00:00
Chet Haase
8896a51cdd am e61fc94b: Merge "Remove View.getBackgroundColor()" into mnc-dev 
* commit 'e61fc94b9b6d4ccba60cca9ac0e0a67539f18780':
  Remove View.getBackgroundColor()
 2015-06-12 15:03:01 +00:00
Chet Haase
e61fc94b9b Merge "Remove View.getBackgroundColor()" into mnc-dev 2015-06-12 14:50:20 +00:00
Chet Haase
3dcb9945fd Remove View.getBackgroundColor() 
This method was added earlier in M - removing it now based on API
Council feedback.

Issue #21572678  API Review: android.view.View.getBackgroundColor()

Change-Id: I04fad49c3c377218d0fb708dbeaea609aca46ce8
 2015-06-12 13:25:27 +01:00
Keisuke Kuroyanagi
2a9fa33626 am a31940df: Merge "Reset drag accelerator state in Editor#sendOnTextChanged." into mnc-dev 
* commit 'a31940df170ea7e8253736ce7b5dba2176699c25':
  Reset drag accelerator state in Editor#sendOnTextChanged.
 2015-06-12 11:20:32 +00:00
Keisuke Kuroyanagi
a31940df17 Merge "Reset drag accelerator state in Editor#sendOnTextChanged." into mnc-dev 2015-06-12 11:10:20 +00:00
Rubin Xu
1cd7136b52 am 5c82d2cc: Change references to APK Certificate to Signature 
* commit '5c82d2cc17df9774e677f6bab9cb52659fc2b56d':
  Change references to APK Certificate to Signature
 2015-06-12 10:05:00 +00:00
Rubin Xu
5c82d2cc17 Change references to APK Certificate to Signature 
The fact that currently apk signature is certificates is just
implementation details.

Bug: 20820366

Change-Id: Icdd02cb51a550ea71ff83a84e2bdfcc21f8d43ed
 2015-06-12 10:32:24 +01:00
Jeff Sharkey
a8b270efa7 am 3c4d6139: Merge "Sigh, some apps are sending null ContentValues." into mnc-dev 
* commit '3c4d613926afb38673e0ffccc624d271f7910ec1':
  Sigh, some apps are sending null ContentValues.
 2015-06-12 05:03:03 +00:00
Yohei Yukawa
a5980b9213 am 09259de0: Merge "Fix JavaDoc error in I392166c77cd9dd2c432dc4f1274312f8355de02b." into mnc-dev 
* commit '09259de032c5209cbc8c094bd4121358932f1139':
  Fix JavaDoc error in I392166c77cd9dd2c432dc4f1274312f8355de02b.
 2015-06-12 05:02:59 +00:00
Jeff Sharkey
3c4d613926 Merge "Sigh, some apps are sending null ContentValues." into mnc-dev 2015-06-12 04:57:08 +00:00
Jeff Sharkey
34796bd07f Sigh, some apps are sending null ContentValues. 
Bug: 21560515
Change-Id: Id5a62611781a2d9da47ad3e522d3d43f860b1f70
 2015-06-11 21:55:32 -07:00
Yohei Yukawa
09259de032 Merge "Fix JavaDoc error in I392166c77cd9dd2c432dc4f1274312f8355de02b." into mnc-dev 2015-06-12 04:53:07 +00:00
Jeff Sharkey
8fcc73f32b am 1c83a043: Merge "Annotate ContentResolver/Provider arguments." into mnc-dev 
* commit '1c83a0430fc36e59ee736021c54a35587981030a':
  Annotate ContentResolver/Provider arguments.
 2015-06-12 04:51:26 +00:00
Jeff Sharkey
1c83a0430f Merge "Annotate ContentResolver/Provider arguments." into mnc-dev 2015-06-12 04:46:15 +00:00
Jeff Sharkey
673db44fb3 Annotate ContentResolver/Provider arguments. 
Explicitly mark if they're @Nullable or @NonNull.

Bug: 21560515
Change-Id: I5f671c241dfe65e5ab8bc06b2382fbf5a82bdb20
 2015-06-11 21:45:05 -07:00
Yohei Yukawa
fd65287cfd Fix JavaDoc error in I392166c77cd9dd2c432dc4f1274312f8355de02b. 
Fix confirmed with 'make doc-comment-check-docs'

Bug: 21446448
Change-Id: Ica4359b13ddbc790740cc22c95b9e002f7c8e4b8
 2015-06-11 21:42:49 -07:00
Jeff Sharkey
efb3159beb am 5347f0ff: Merge "Valid filenames have length limits!" into mnc-dev 
* commit '5347f0ff3857baae7b889d24acd352cabcc9205b':
  Valid filenames have length limits!
 2015-06-12 02:28:57 +00:00
Jeff Sharkey
5347f0ff38 Merge "Valid filenames have length limits!" into mnc-dev 2015-06-12 02:18:29 +00:00
Jeff Sharkey
4f5e8b3ca4 Valid filenames have length limits! 
ext4 filenames are at most 255 bytes.  vfat filenames are bit more
lax, but we're often saving them on ext4 through a FUSE daemon, so
limit them the same way.

Since package names are used as directory names, verify that they're
valid filenames.

Tests to verify behavior.

Bug: 18689171
Change-Id: If7df4c40d352954510b71de4ff05d78259c721ed
 2015-06-11 19:16:27 -07:00
Adam Powell
f6396f3515 am de64ac45: Merge "Check targetSdkVersion when passing size hints for UNSPECIFIED specs" into mnc-dev 
* commit 'de64ac459917d65c9e60ae04deac37b7f965a69c':
  Check targetSdkVersion when passing size hints for UNSPECIFIED specs
 2015-06-12 00:51:53 +00:00
Yohei Yukawa
bef9e5cb18 am d4673355: Merge "Keyboard.Key#onReleased() should handle inside parameter." into mnc-dev 
* commit 'd46733556be3fdcdc3ba3c5339c595406c960b09':
  Keyboard.Key#onReleased() should handle inside parameter.
 2015-06-12 00:51:43 +00:00
Adam Powell
de64ac4599 Merge "Check targetSdkVersion when passing size hints for UNSPECIFIED specs" into mnc-dev 2015-06-12 00:45:23 +00:00
Ruben Brunk
9f44201c65 am 25f3a7d1: Merge "Make CameraDeviceImpl#close() idempotent (for real)." into mnc-dev 
* commit '25f3a7d19b2fb9b33cb83d3d8f90c724cd26c9c9':
  Make CameraDeviceImpl#close() idempotent (for real).
 2015-06-12 00:41:30 +00:00
Yohei Yukawa
d46733556b Merge "Keyboard.Key#onReleased() should handle inside parameter." into mnc-dev 2015-06-12 00:38:25 +00:00
Ruben Brunk
25f3a7d19b Merge "Make CameraDeviceImpl#close() idempotent (for real)." into mnc-dev 2015-06-12 00:25:48 +00:00
Navtej Singh Mann
efd5a2239f am 3c0ce5ca: fix ArrayIndexOutOfBoundsException while starting WifiScannerScan 
* commit '3c0ce5ca14ba13f432f4309c001abcb1d7cfc159':
  fix ArrayIndexOutOfBoundsException while starting WifiScannerScan
 2015-06-12 00:18:56 +00:00
Navtej Singh Mann
3c0ce5ca14 fix ArrayIndexOutOfBoundsException while starting WifiScannerScan 
bug: 21663831
Change-Id: I9aea30907aae00c98d8fb1dc1fff3f4935108fa4
 2015-06-11 17:04:15 -07:00
Dianne Hackborn
39a87c7332 am 2430f47b: Merge "Add ArraySet to the SDK." into mnc-dev 
* commit '2430f47be7b7de7456e16eb5098242c22a6317ee':
  Add ArraySet to the SDK.
 2015-06-11 23:22:41 +00:00
Dianne Hackborn
2430f47be7 Merge "Add ArraySet to the SDK." into mnc-dev 2015-06-11 23:14:37 +00:00
Ruben Brunk
0953b6461a Make CameraDeviceImpl#close() idempotent (for real). 
- Also fixes onClosed() implementation in CameraDeviceImpl;
  this would never return true previously.

Bug: 21698939
Change-Id: I4dd56a1410b9fc64152acc5296514f5841794fa9
 2015-06-11 16:12:35 -07:00
Ruben Brunk
1f29544cbb am dcb9e169: Merge "Set scaling mode for legacy device surfaces." into mnc-dev 
* commit 'dcb9e169d7b37d62112c25c65da54c2b92651f9f':
  Set scaling mode for legacy device surfaces.
 2015-06-11 22:27:45 +00:00
Adam Lesinski
5e3394fe1e am 2e49bfa6: Merge "UsageStats: Change INTERACTION to SYSTEM_INTERACTION" into mnc-dev 
* commit '2e49bfa6f02a4ab831a43453231888aa6d9c4ce1':
  UsageStats: Change INTERACTION to SYSTEM_INTERACTION
 2015-06-11 22:22:57 +00:00
Ruben Brunk
dcb9e169d7 Merge "Set scaling mode for legacy device surfaces." into mnc-dev 2015-06-11 22:15:58 +00:00
Ruben Brunk
a94c603345 Set scaling mode for legacy device surfaces. 
Bug: 19371754
Change-Id: I0dd762e7b1485ba2d3bec9604407125c35ad1218
 2015-06-11 15:15:17 -07:00
Dimitry Ivanov
1a2584d864 am 06f3cd8e: Merge "Make apk entry separator compliant with jar url format" into mnc-dev 
* commit '06f3cd8e8b03786851cc6c9b79487c9c8516e883':
  Make apk entry separator compliant with jar url format
 2015-06-11 22:14:58 +00:00
Dmitriy Ivanov
9410b1f069 am 99fc7e95: Merge "Add path to native libraries inside apk" into mnc-dev 
* commit '99fc7e95c51c662e8ac1e6cb00e9051a34127b92':
  Add path to native libraries inside apk
 2015-06-11 22:14:52 +00:00
Carlos Valdivia
149b3efd29 am b3c134e1: Merge "Revert "Revert "Permissions: Fix account related permissions.""" into mnc-dev 
* commit 'b3c134e1614e02471811a43d12bedcfc5778667b':
  Revert "Revert "Permissions: Fix account related permissions.""
 2015-06-11 22:13:44 +00:00
Adam Lesinski
2e49bfa6f0 Merge "UsageStats: Change INTERACTION to SYSTEM_INTERACTION" into mnc-dev 2015-06-11 22:02:37 +00:00
Adam Lesinski
c8e8729244 UsageStats: Change INTERACTION to SYSTEM_INTERACTION 
SYSTEM_INTERACTION events are signals to the system for a package's
implicit actions (service bound, etc).

These should not affect the API visible stats like lastTimeUsed, etc.
USER_INTERACTION is for user initiated actions (notification interaction, etc).

Bug:21761781
Change-Id: I4585cf35fbb158612a3c737710108bec34e89183
 2015-06-11 22:01:45 +00:00
Dimitry Ivanov
06f3cd8e8b Merge "Make apk entry separator compliant with jar url format" into mnc-dev 2015-06-11 21:55:02 +00:00
Dmitriy Ivanov
99fc7e95c5 Merge "Add path to native libraries inside apk" into mnc-dev 2015-06-11 21:55:01 +00:00
Alex Klyubin
66629bc540 Document that DownloadManager supports HTTPS. 
Bug: 14112655
Change-Id: I37708553b7ae2f48dcd574f3c66daa8dfdd00f3a
 2015-06-11 14:34:44 -07:00
Carlos Valdivia
b3c134e161 Merge "Revert "Revert "Permissions: Fix account related permissions.""" into mnc-dev 2015-06-11 21:18:03 +00:00
Carlos Valdivia
6eb73a5778 Revert "Revert "Permissions: Fix account related permissions."" 
This reverts commit dcddc47665.

Change-Id: Ie2402167fc7cd3d5e57bf2fba704fdf00cfcb4fe
 2015-06-11 14:10:04 -07:00
Adam Powell
d5dbf4b2a0 Check targetSdkVersion when passing size hints for UNSPECIFIED specs 
As of MNC stock widgets will pass a size in UNSPECIFIED MeasureSpec
values as a hint of the container size. This lets things like list items
size themselves at 1/3 the size of their container.

This breaks assumptions in a few existing applications, so maintain the
old expectation of 0 size in UNSPECIFIED MeasureSpecs for apps targeting
older SDK versions.

Bug 20975083

Change-Id: Ic7318e88854e00d96852dde2c0e10376b42bf77f
 2015-06-11 13:57:41 -07:00
Dianne Hackborn
f16747db09 Add ArraySet to the SDK. 
Also fix some documentation.

Change-Id: I46025c3b5450e7cd671135b99ff3b298e223651d
 2015-06-11 13:53:13 -07:00
Ruben Brunk
d2481f8960 am c2b40926: Merge "Fix intermediate preview size selection for legacy." into mnc-dev 
* commit 'c2b409267e1d9b99d4357d566291fcb9a2e88464':
  Fix intermediate preview size selection for legacy.
 2015-06-11 20:37:17 +00:00
Yin-Chia Yeh
240718ca10 am dba1cf3d: Merge "Camera2: Legacy: handle FPS range properly" into mnc-dev 
* commit 'dba1cf3d515b382e997a5a0e50b50215e3f65f9e':
  Camera2: Legacy: handle FPS range properly
 2015-06-11 20:37:11 +00:00