Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
200,692 Commits 3 Branches 0 Tags
2b27d4fdd84b01aa76fa76b0d6625e68e194fb8a
Commit Graph

49500 Commits

Author SHA1 Message Date
Jeff Sharkey
2b27d4fdd8 am aaf42c9e: am c69a4fc5: am 1c83a043: Merge "Annotate ContentResolver/Provider arguments." into mnc-dev 
* commit 'aaf42c9ea0e2294fd6a4cc8b13b54d392b1424a4':
  Annotate ContentResolver/Provider arguments.
 2015-06-12 05:21:15 +00:00
Jeff Sharkey
018913fe24 am c1a54115: am 2e9704f9: am 5347f0ff: Merge "Valid filenames have length limits!" into mnc-dev 
* commit 'c1a54115bdf8eead6e84e776c990a567d9d3e47c':
  Valid filenames have length limits!
 2015-06-12 05:15:36 +00:00
Jeff Sharkey
aaf42c9ea0 am c69a4fc5: am 1c83a043: Merge "Annotate ContentResolver/Provider arguments." into mnc-dev 
* commit 'c69a4fc556b8c4bd6d28abde3c73b65384a6c574':
  Annotate ContentResolver/Provider arguments.
 2015-06-12 05:03:03 +00:00
Yohei Yukawa
5b2a0987fa Fix JavaDoc error in I392166c77cd9dd2c432dc4f1274312f8355de02b. 
Fix confirmed with 'make doc-comment-check-docs'

Bug: 21446448
Change-Id: Ica4359b13ddbc790740cc22c95b9e002f7c8e4b8
(cherry picked from commit fd65287cfd)
 2015-06-12 04:57:29 +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
Jeff Sharkey
c1a54115bd am 2e9704f9: am 5347f0ff: Merge "Valid filenames have length limits!" into mnc-dev 
* commit '2e9704f969df4d140f4c54243c6faabf17517144':
  Valid filenames have length limits!
 2015-06-12 02:41:30 +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
b94e938e50 am 0b8f8c78: am b0fb6255: am de64ac45: Merge "Check targetSdkVersion when passing size hints for UNSPECIFIED specs" into mnc-dev 
* commit '0b8f8c78a250b252e7c5b06c5f1f404e33791ff0':
  Check targetSdkVersion when passing size hints for UNSPECIFIED specs
 2015-06-12 01:37:01 +00:00
Yohei Yukawa
b75c59ffd0 am 4878a26c: am bbbe13d5: am d4673355: Merge "Keyboard.Key#onReleased() should handle inside parameter." into mnc-dev 
* commit '4878a26cb6bf9367ec438621bb6506385eee6604':
  Keyboard.Key#onReleased() should handle inside parameter.
 2015-06-12 01:36:50 +00:00
Adam Powell
0b8f8c78a2 am b0fb6255: am de64ac45: Merge "Check targetSdkVersion when passing size hints for UNSPECIFIED specs" into mnc-dev 
* commit 'b0fb62554b7083f38ee59a781f24e6e2996cc6bf':
  Check targetSdkVersion when passing size hints for UNSPECIFIED specs
 2015-06-12 01:08:34 +00:00
Yohei Yukawa
4878a26cb6 am bbbe13d5: am d4673355: Merge "Keyboard.Key#onReleased() should handle inside parameter." into mnc-dev 
* commit 'bbbe13d51998968c188c2530df8ac823dcccca8c':
  Keyboard.Key#onReleased() should handle inside parameter.
 2015-06-12 01:08:24 +00:00
Ruben Brunk
64ebf78274 am 3435b0ba: am 86f3fbf7: am 25f3a7d1: Merge "Make CameraDeviceImpl#close() idempotent (for real)." into mnc-dev 
* commit '3435b0ba8dcb50e26c4aaf3e9451cdbf9a3fc7d6':
  Make CameraDeviceImpl#close() idempotent (for real).
 2015-06-12 01:05:20 +00:00
Ruben Brunk
3435b0ba8d am 86f3fbf7: am 25f3a7d1: Merge "Make CameraDeviceImpl#close() idempotent (for real)." into mnc-dev 
* commit '86f3fbf721f87419d61fd03f9212b15b48225a3c':
  Make CameraDeviceImpl#close() idempotent (for real).
 2015-06-12 00:51:57 +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
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
Dianne Hackborn
23b91d68b0 am 3122239a: am 550ae6db: am 2430f47b: Merge "Add ArraySet to the SDK." into mnc-dev 
* commit '3122239a504eb51bfbf5473ea68a0372caf04e6d':
  Add ArraySet to the SDK.
 2015-06-11 23:52:29 +00:00
Dianne Hackborn
3122239a50 am 550ae6db: am 2430f47b: Merge "Add ArraySet to the SDK." into mnc-dev 
* commit '550ae6db7f888cf6431c339274973faee352a507':
  Add ArraySet to the SDK.
 2015-06-11 23:36:06 +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
1260589328 am 35b387f3: am 879e12a1: am dcb9e169: Merge "Set scaling mode for legacy device surfaces." into mnc-dev 
* commit '35b387f36008a69d1b61cc2760d464db3b898ee8':
  Set scaling mode for legacy device surfaces.
 2015-06-11 22:54:05 +00:00
Adam Lesinski
9407e4bf9f am 6b7d2ec1: am 9598abea: am 2e49bfa6: Merge "UsageStats: Change INTERACTION to SYSTEM_INTERACTION" into mnc-dev 
* commit '6b7d2ec164961238af75779233b685a945c3ee28':
  UsageStats: Change INTERACTION to SYSTEM_INTERACTION
 2015-06-11 22:53:54 +00:00
Ruben Brunk
35b387f360 am 879e12a1: am dcb9e169: Merge "Set scaling mode for legacy device surfaces." into mnc-dev 
* commit '879e12a14ac2bb756a3548c67ff4145a9b1aeedf':
  Set scaling mode for legacy device surfaces.
 2015-06-11 22:43:32 +00:00
Adam Lesinski
6b7d2ec164 am 9598abea: am 2e49bfa6: Merge "UsageStats: Change INTERACTION to SYSTEM_INTERACTION" into mnc-dev 
* commit '9598abea3160328bbf98ca5eb04f7b1502417469':
  UsageStats: Change INTERACTION to SYSTEM_INTERACTION
 2015-06-11 22:43:20 +00:00
Dimitry Ivanov
1605447e70 am d1fff752: am b900e2c7: am 06f3cd8e: Merge "Make apk entry separator compliant with jar url format" into mnc-dev 
* commit 'd1fff752bf7f28bc4e4a983bb34524113e216285':
  Make apk entry separator compliant with jar url format
 2015-06-11 22:28:25 +00:00
Dmitriy Ivanov
b847b23b53 am 4aad8a4c: am ff004b9f: am 99fc7e95: Merge "Add path to native libraries inside apk" into mnc-dev 
* commit '4aad8a4c0d7c68f0eda5e2d394140c9237fbac56':
  Add path to native libraries inside apk
 2015-06-11 22:28:19 +00:00
Carlos Valdivia
1d2bd010ec am e6f426a1: am fe216ddd: am b3c134e1: Merge "Revert "Revert "Permissions: Fix account related permissions.""" into mnc-dev 
* commit 'e6f426a109aff7b081f9dc59722cee80c1092e91':
  Revert "Revert "Permissions: Fix account related permissions.""
 2015-06-11 22:27:57 +00:00
Dimitry Ivanov
d1fff752bf am b900e2c7: am 06f3cd8e: Merge "Make apk entry separator compliant with jar url format" into mnc-dev 
* commit 'b900e2c76d2b8b937e5e5b8534a62cbf75b2398f':
  Make apk entry separator compliant with jar url format
 2015-06-11 22:17:01 +00:00
Dmitriy Ivanov
4aad8a4c0d am ff004b9f: am 99fc7e95: Merge "Add path to native libraries inside apk" into mnc-dev 
* commit 'ff004b9f2f5d6e3fdae82548d74681e9789b8b51':
  Add path to native libraries inside apk
 2015-06-11 22:16:56 +00:00
Carlos Valdivia
e6f426a109 am fe216ddd: am b3c134e1: Merge "Revert "Revert "Permissions: Fix account related permissions.""" into mnc-dev 
* commit 'fe216ddd9dc4d3589c1e6fe9eae94ec6d5a5029f':
  Revert "Revert "Permissions: Fix account related permissions.""
 2015-06-11 22:16:38 +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
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
Ruben Brunk
87e84834a7 am 353d807f: am 49f64f2e: am c2b40926: Merge "Fix intermediate preview size selection for legacy." into mnc-dev 
* commit '353d807fd96e7a3bc15ac1ea85b109c2b93201aa':
  Fix intermediate preview size selection for legacy.
 2015-06-11 21:33:49 +00:00
Yin-Chia Yeh
a8ec85ca4a am 600bd60d: am 990c85d0: am dba1cf3d: Merge "Camera2: Legacy: handle FPS range properly" into mnc-dev 
* commit '600bd60d7ee53dead3b5d04cc7edddc22b48a9a9':
  Camera2: Legacy: handle FPS range properly
 2015-06-11 21:33:44 +00:00
Adam Lesinski
64bf0f000c am 3189d8db: am 6643da95: am df85c12b: Merge "Doze: Use Settings.Global.DEVICE_IDLE_CONSTANTS instead of hardcoded constants" into mnc-dev 
* commit '3189d8db75128142d1a8651ca60e9304fb214057':
  Doze: Use Settings.Global.DEVICE_IDLE_CONSTANTS instead of hardcoded constants
 2015-06-11 21:25:01 +00:00
Carlos Valdivia
6b4450bcf8 am f68b581c: am 9c9ebccd: am d0041e5f: Merge "Revert "Permissions: Fix account related permissions."" into mnc-dev 
* commit 'f68b581cb0687fb1b40258ea526d1154df311bee':
  Revert "Permissions: Fix account related permissions."
 2015-06-11 21:24:44 +00:00
Jeff Sharkey
4d98bd0e3a am 03d3aefd: am a6f89a07: am c8488e99: Merge "Ignore some more generic USB device names." into mnc-dev 
* commit '03d3aefd3e0cc1b1cd1f43792ab9c3fc3bc9614c':
  Ignore some more generic USB device names.
 2015-06-11 21:24:39 +00:00
Carlos Valdivia
b3c134e161 Merge "Revert "Revert "Permissions: Fix account related permissions.""" into mnc-dev 2015-06-11 21:18:03 +00:00
Ruben Brunk
353d807fd9 am 49f64f2e: am c2b40926: Merge "Fix intermediate preview size selection for legacy." into mnc-dev 
* commit '49f64f2e0a6fb3d0ab15dc04194a463412cfb1bc':
  Fix intermediate preview size selection for legacy.
 2015-06-11 21:11:48 +00:00
Yin-Chia Yeh
600bd60d7e am 990c85d0: am dba1cf3d: Merge "Camera2: Legacy: handle FPS range properly" into mnc-dev 
* commit '990c85d0c242cb2c53f0e6e90e14479236ca995b':
  Camera2: Legacy: handle FPS range properly
 2015-06-11 21:11:43 +00:00
Zheng Fu
e767c11cdc am cc7d826c: am dfd93c69: Merge "Revert contact metadata_sync constants." into mnc-dev 
* commit 'cc7d826c91c6609029178e1fd8648107697e7b1e':
  Revert contact metadata_sync constants.
 2015-06-11 21:11:25 +00:00
Adam Lesinski
3189d8db75 am 6643da95: am df85c12b: Merge "Doze: Use Settings.Global.DEVICE_IDLE_CONSTANTS instead of hardcoded constants" into mnc-dev 
* commit '6643da955796231da5193c50aafcc59ff8655f7f':
  Doze: Use Settings.Global.DEVICE_IDLE_CONSTANTS instead of hardcoded constants
 2015-06-11 21:11:21 +00:00
Carlos Valdivia
f68b581cb0 am 9c9ebccd: am d0041e5f: Merge "Revert "Permissions: Fix account related permissions."" into mnc-dev 
* commit '9c9ebccd028fecafaf36660351ce598b7ff8106c':
  Revert "Permissions: Fix account related permissions."
 2015-06-11 21:10:55 +00:00
Jeff Sharkey
03d3aefd3e am a6f89a07: am c8488e99: Merge "Ignore some more generic USB device names." into mnc-dev 
* commit 'a6f89a07f191c8f80d7cbce62b178f8bdc23ec18':
  Ignore some more generic USB device names.
 2015-06-11 21:10:50 +00:00