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

156992 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eino-Ville Talvala
e8df3093f5 Camera2: Add frameNumber to CaptureCallback#onCaptureStarted 
Otherwise, cannot reliably match up capture progressed and failure callbacks
with the start callback.

Bug: 17421092
Change-Id: I91d92be70a15536b215bac330370ce37e426ec26
 2014-09-09 12:38:11 -07:00
Jeff Sharkey
e47d5435de Use sscanf() for parsing tag values. 
Neither strtoll() nor strtoull() can parse the %llx formatted tag
values coming from the kernel.  We know the lowest 32 bits will never
be set, so fast-path the 3-character case as 0x0.

Bug: 17365163
Change-Id: I238bbd2830c9335e7ab7a53362d6e12b46e0bcb3
 2014-09-09 12:29:41 -07:00
Amith Yamasani
26af829fd7 User restriction to disallow outgoing NFC beam 
This can be controlled by MDMs via DPM.

Also fixes:
 - javadoc for restrictions
 - persisting of cross profile copy/paste restriction

Bug: 17387303
Change-Id: Ie148f56189181d2a4c6345c0823d417ab13a94a3
 2014-09-09 12:09:47 -07:00
Griff Hazen
87631502eb am 78ce7d0b: am 527006ad: am df35ac5f: Merge "Remove reference to StatusBarNotification after the value is accessed." into lmp-dev 
* commit '78ce7d0bd36fb3b20a05aed600367cbb0ff8b5a2':
  Remove reference to StatusBarNotification after the value is accessed.
 2014-09-09 18:58:34 +00:00
Chris Craik
5b84d6cd82 am 895221fb: am 70cf8fba: am c9071002: Merge "Fix tessellation bounds computation" into lmp-dev 
* commit '895221fbc5d0c7f8b631ccdbc8590a2306cbb6fd':
  Fix tessellation bounds computation
 2014-09-09 18:58:29 +00:00
Winson Chung
b76b28005e am 752b82bc: am e5ef0872: am 3d0581d0: Merge "Fixing issue with screen pinning not working. (Bug 17436123)" into lmp-dev 
* commit '752b82bc5f31a9fd9051ac041cca887620ec40e6':
  Fixing issue with screen pinning not working. (Bug 17436123)
 2014-09-09 18:58:24 +00:00
Winson Chung
13695d4422 am 47a32422: am 79768b15: am 2d6118a1: Merge "Separating the notion of transposed search vs nav bar. (Bug 17402331)" into lmp-dev 
* commit '47a324225a0f64b1b369c1243ab1bb20e4f46d35':
  Separating the notion of transposed search vs nav bar. (Bug 17402331)
 2014-09-09 18:58:19 +00:00
Griff Hazen
88a9c55233 am f26b4fda: am accb122d: am c06b7a78: Copy visibility docs from support version to base Notification. 
* commit 'f26b4fdac14531e9a18a476db1ddf07a0cadefe8':
  Copy visibility docs from support version to base Notification.
 2014-09-09 18:58:14 +00:00
Griff Hazen
6b6fe58db1 am 527006ad: am df35ac5f: Merge "Remove reference to StatusBarNotification after the value is accessed." into lmp-dev 
* commit '527006ad3a84a1cec342d00a59ab766aee4730cd':
  Remove reference to StatusBarNotification after the value is accessed.
 2014-09-09 18:47:50 +00:00
Chris Craik
a23fc5877b am 70cf8fba: am c9071002: Merge "Fix tessellation bounds computation" into lmp-dev 
* commit '70cf8fba276269c6d162819bf4cbcdf06f6d22ea':
  Fix tessellation bounds computation
 2014-09-09 18:47:43 +00:00
Winson Chung
72e6144823 am e5ef0872: am 3d0581d0: Merge "Fixing issue with screen pinning not working. (Bug 17436123)" into lmp-dev 
* commit 'e5ef08721892e08b0aa035a4610897b49d78e289':
  Fixing issue with screen pinning not working. (Bug 17436123)
 2014-09-09 18:47:38 +00:00
Winson Chung
9b5de18d3c am 79768b15: am 2d6118a1: Merge "Separating the notion of transposed search vs nav bar. (Bug 17402331)" into lmp-dev 
* commit '79768b1542aaf2fa1f259e754de3c8c2d07b1058':
  Separating the notion of transposed search vs nav bar. (Bug 17402331)
 2014-09-09 18:47:34 +00:00
Griff Hazen
1d67649c61 am accb122d: am c06b7a78: Copy visibility docs from support version to base Notification. 
* commit 'accb122dcd7b45914b508299af0b44376745bed3':
  Copy visibility docs from support version to base Notification.
 2014-09-09 18:47:29 +00:00
Griff Hazen
2b775fa045 am df35ac5f: Merge "Remove reference to StatusBarNotification after the value is accessed." into lmp-dev 
* commit 'df35ac5fab51383099a2f8e5206202af58ef79bf':
  Remove reference to StatusBarNotification after the value is accessed.
 2014-09-09 18:42:08 +00:00
Chris Craik
2c4cf3f5b0 am c9071002: Merge "Fix tessellation bounds computation" into lmp-dev 
* commit 'c907100262b423e28dfd7258cb86c515c421a5d0':
  Fix tessellation bounds computation
 2014-09-09 18:36:36 +00:00
Winson Chung
44455d492d am 3d0581d0: Merge "Fixing issue with screen pinning not working. (Bug 17436123)" into lmp-dev 
* commit '3d0581d0c3a88b95760bec6fbbf4df033b6f239f':
  Fixing issue with screen pinning not working. (Bug 17436123)
 2014-09-09 18:36:32 +00:00
Winson Chung
ea33169e82 am 2d6118a1: Merge "Separating the notion of transposed search vs nav bar. (Bug 17402331)" into lmp-dev 
* commit '2d6118a1821a882cfad600d78ef3de34800148ba':
  Separating the notion of transposed search vs nav bar. (Bug 17402331)
 2014-09-09 18:36:27 +00:00
Griff Hazen
380c394987 am c06b7a78: Copy visibility docs from support version to base Notification. 
* commit 'c06b7a78433830308ac62be25b3a13d6415e3699':
  Copy visibility docs from support version to base Notification.
 2014-09-09 18:36:23 +00:00
Griff Hazen
2f439763bd Merge "Remove reference to StatusBarNotification after the value is accessed." into lmp-dev 2014-09-09 18:35:54 +00:00
Chris Craik
69fb8a2399 Merge "Fix tessellation bounds computation" into lmp-dev 2014-09-09 18:34:08 +00:00
Winson Chung
69550456e3 Merge "Fixing issue with screen pinning not working. (Bug 17436123)" into lmp-dev 2014-09-09 18:33:18 +00:00
Winson Chung
31e8d7602c Merge "Separating the notion of transposed search vs nav bar. (Bug 17402331)" into lmp-dev 2014-09-09 18:33:08 +00:00
Jason Monk
ce0bd0b745 am c8b3d218: am a03fb8a1: am 76779dbc: Merge "Add user-specific playSoundEffect and use in NavBar" into lmp-dev 
* commit 'c8b3d218f764b19dbe00d82d552304f4f9e07408':
  Add user-specific playSoundEffect and use in NavBar
 2014-09-09 18:31:28 +00:00
Vineeta Srivastava
91a735e203 am 954ffb7b: am 04454473: am a66c2cd1: Merge "Set MTU size to 1410 for Telus." into lmp-dev 
* commit '954ffb7bfb439560b2544497e264b6ec782a6d0e':
  Set MTU size to 1410 for Telus.
 2014-09-09 18:31:23 +00:00
Jason Monk
4fefc7d7bd am a03fb8a1: am 76779dbc: Merge "Add user-specific playSoundEffect and use in NavBar" into lmp-dev 
* commit 'a03fb8a19e055ae9d1d56fc21d304da9e11c5510':
  Add user-specific playSoundEffect and use in NavBar
 2014-09-09 18:19:59 +00:00
Vineeta Srivastava
1db0d8ff67 am 04454473: am a66c2cd1: Merge "Set MTU size to 1410 for Telus." into lmp-dev 
* commit '04454473a0cf58fc42f71d93ceb742c7927682ed':
  Set MTU size to 1410 for Telus.
 2014-09-09 18:19:54 +00:00
Alexandra Gherghina
dc402384fd am af3d0a7c: am f695833a: am c3b392d0: Merge "Removing the NO_CROSS_PROFILE flag for intent forwarding" into lmp-dev 
* commit 'af3d0a7ccc70f355333d22237299f5d793448b31':
  Removing the NO_CROSS_PROFILE flag for intent forwarding
 2014-09-09 18:14:13 +00:00
Wink Saville
123858a1ef am 9eb52a3f: am 94804242: am 5dac65ad: Change suffix UsingSubId to ForSubscriber. 
* commit '9eb52a3f941251a5e992c1b2d00c61435d1e8890':
  Change suffix UsingSubId to ForSubscriber.
 2014-09-09 18:14:08 +00:00
Jason Monk
b34b8e9376 am 76779dbc: Merge "Add user-specific playSoundEffect and use in NavBar" into lmp-dev 
* commit '76779dbc3f743aada5c1f0c545dbf90722249511':
  Add user-specific playSoundEffect and use in NavBar
 2014-09-09 18:09:09 +00:00
Vineeta Srivastava
d3773b2914 am a66c2cd1: Merge "Set MTU size to 1410 for Telus." into lmp-dev 
* commit 'a66c2cd18b668b8c692b2c632ec260e4b7fdb46f':
  Set MTU size to 1410 for Telus.
 2014-09-09 18:09:04 +00:00
Griff Hazen
e8d49dfc5e am 62544b8a: am 40c1a0f1: am b0e0f2f6: Merge "Add support for a circular bitmap overlay for round android wear emulator." into lmp-dev 
* commit '62544b8a0d51be56953986f47bd52742a6bbe397':
  Add support for a circular bitmap overlay for round android wear emulator.
 2014-09-09 18:08:31 +00:00
Jae Seo
c44c64e824 am 9ae2fd2f: am c83c5596: am e188fc30: Merge "Add Japanese content ratings" into lmp-dev 
* commit '9ae2fd2fe828b740a0ca399c7973fe16359bbbcd':
  Add Japanese content ratings
 2014-09-09 18:08:26 +00:00
Craig Mautner
cb9bbc7f77 am 37af2b51: am 2297d88d: am 77e1dc74: Merge "Remove deprecated (and now unused) API method." into lmp-dev 
* commit '37af2b51c5f3198392de94acbf2ec13ed9563be4':
  Remove deprecated (and now unused) API method.
 2014-09-09 18:08:20 +00:00
Griff Hazen
fc3922d49b Copy visibility docs from support version to base Notification. 
(Noticed the difference in a javadoc diff between Notification and
NotificationCompat)

Bug: 17424399

Change-Id: I639a46c429ffebf8ca47118b2ea80f40ccdc1286
 2014-09-09 18:03:40 +00:00
Jason Monk
9580f6c6cb Merge "Add user-specific playSoundEffect and use in NavBar" into lmp-dev 2014-09-09 18:03:14 +00:00
Vineeta Srivastava
1f14863871 Merge "Set MTU size to 1410 for Telus." into lmp-dev 2014-09-09 18:02:57 +00:00
Alexandra Gherghina
ed225682c5 am f695833a: am c3b392d0: Merge "Removing the NO_CROSS_PROFILE flag for intent forwarding" into lmp-dev 
* commit 'f695833ab5764c7b031f43f78a288eec2e162dcc':
  Removing the NO_CROSS_PROFILE flag for intent forwarding
 2014-09-09 17:57:56 +00:00
Wink Saville
d601edd52e am 94804242: am 5dac65ad: Change suffix UsingSubId to ForSubscriber. 
* commit '948042422975e4c445e73213cb4c4a49b48d108d':
  Change suffix UsingSubId to ForSubscriber.
 2014-09-09 17:57:51 +00:00
Philip Milne
e4fe75aa60 Merge "Fix for b/16400888 - API Review: GridLayout attributes" 2014-09-09 17:53:11 +00:00
Alexandra Gherghina
17f3cdc820 am c3b392d0: Merge "Removing the NO_CROSS_PROFILE flag for intent forwarding" into lmp-dev 
* commit 'c3b392d02693f8236fdc6ebc90412e3c4aaa5843':
  Removing the NO_CROSS_PROFILE flag for intent forwarding
 2014-09-09 17:52:46 +00:00
Philip Milne
1af024c9c8 Fix for b/16400888 - API Review: GridLayout attributes 
Column weights specify the relative proportions of space distribution 
within a *row*. With that in mind, I flipped the vertical and horizontal 
axes in the docs - but that was a mistake. This CL flips the docs back. 
The code works the right way around so doesn't need to be modified.

Change-Id: I1a36882eee8d1b9bd7b8ef10e03cbf66de0ac261
 2014-09-09 17:49:35 +00:00
Wink Saville
5c1659045d am 5dac65ad: Change suffix UsingSubId to ForSubscriber. 
* commit '5dac65ad043ee9d0535813ef5dba06dd80c11f82':
  Change suffix UsingSubId to ForSubscriber.
 2014-09-09 17:46:53 +00:00
Alexandra Gherghina
7677694320 Merge "Removing the NO_CROSS_PROFILE flag for intent forwarding" into lmp-dev 2014-09-09 17:45:36 +00:00
Griff Hazen
7341db9a2e am 40c1a0f1: am b0e0f2f6: Merge "Add support for a circular bitmap overlay for round android wear emulator." into lmp-dev 
* commit '40c1a0f157c581bdd88e3c55c625d2b438389bd6':
  Add support for a circular bitmap overlay for round android wear emulator.
 2014-09-09 17:42:09 +00:00
Jae Seo
8e036f3a83 am c83c5596: am e188fc30: Merge "Add Japanese content ratings" into lmp-dev 
* commit 'c83c5596bf4f2e463ca54d12e566f4c04b9c55aa':
  Add Japanese content ratings
 2014-09-09 17:42:04 +00:00
Wink Saville
bc0272754d Change suffix UsingSubId to ForSubscriber. 
Bug: 17255752
Change-Id: Ifd522888b5aaae111f642d1e35bd1bb939e539d4
 2014-09-09 17:38:19 +00:00
Griff Hazen
3eeb09605d am b0e0f2f6: Merge "Add support for a circular bitmap overlay for round android wear emulator." into lmp-dev 
* commit 'b0e0f2f6185fc42842ff3fccedcc608c5a8f8d27':
  Add support for a circular bitmap overlay for round android wear emulator.
 2014-09-09 17:31:02 +00:00
Jae Seo
2c42ed0b41 am e188fc30: Merge "Add Japanese content ratings" into lmp-dev 
* commit 'e188fc30686135b6d96ced7acf4afdf5ecdf641d':
  Add Japanese content ratings
 2014-09-09 17:30:57 +00:00
Griff Hazen
8fd30e4486 Merge "Add support for a circular bitmap overlay for round android wear emulator." into lmp-dev 2014-09-09 17:25:47 +00:00
Jae Seo
a45fe78110 Merge "Add Japanese content ratings" into lmp-dev 2014-09-09 17:21:59 +00:00