Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
175,803 Commits 3 Branches 0 Tags
0fe87f68d16f4eb855b52da5dcc6bfbea47a92be
Commit Graph

48176 Commits

Author SHA1 Message Date
Mike Lockwood
6e8fea14cc Merge "ParcelFileDescriptor: add support for non-stream socket pairs." 2014-12-01 21:17:36 +00:00
Wale Ogunwale
0ea8edef69 am ea64d0be: am e05fbd69: am 997e632f: Merge "Added unique id to display devices and their settings." into lmp-mr1-dev 
* commit 'ea64d0beea59e3350bea0c6fe8d7cef807f82601':
  Added unique id to display devices and their settings.
 2014-12-01 20:44:06 +00:00
Wale Ogunwale
ea64d0beea am e05fbd69: am 997e632f: Merge "Added unique id to display devices and their settings." into lmp-mr1-dev 
* commit 'e05fbd6901eb8c89ea18fe90c15d69e7c17596ae':
  Added unique id to display devices and their settings.
 2014-12-01 20:37:01 +00:00
Mike Lockwood
ced0c25a40 ParcelFileDescriptor: add support for non-stream socket pairs. 
For example, we can use this to create SOCK_SEQPACKET socket pairs.

Change-Id: Ief5c1dab3cbbe40a756d37e77968b41511297bec
 2014-12-01 12:36:11 -08:00
Wale Ogunwale
e05fbd6901 am 997e632f: Merge "Added unique id to display devices and their settings." into lmp-mr1-dev 
* commit '997e632f59b070dabf71d9e807847c0643da92ac':
  Added unique id to display devices and their settings.
 2014-12-01 20:30:33 +00:00
Wale Ogunwale
997e632f59 Merge "Added unique id to display devices and their settings." into lmp-mr1-dev 2014-12-01 20:26:06 +00:00
Alan Viverette
643b4aa61d am 02cd927d: am 53644fb5: am 015b9e56: Merge "Cancel dialog when TimePickerDialog\'s BUTTON_NEGATIVE is clicked" into lmp-mr1-dev 
* commit '02cd927dffa24479a0ca29b40ead7b28f9e60a7c':
  Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked
 2014-12-01 20:07:27 +00:00
Jeff Sharkey
2a3ca185bf am 45207128: am 05d455ca: am b9ccc047: Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev 
* commit '45207128c5c4f0d1f106af8561bdd156546b0aad':
  Sanitize display names, keep extensions intact.
 2014-12-01 20:07:19 +00:00
Alan Viverette
02cd927dff am 53644fb5: am 015b9e56: Merge "Cancel dialog when TimePickerDialog\'s BUTTON_NEGATIVE is clicked" into lmp-mr1-dev 
* commit '53644fb5acd394b875723b6483215ba837f8e6c0':
  Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked
 2014-12-01 20:00:49 +00:00
Jeff Sharkey
45207128c5 am 05d455ca: am b9ccc047: Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev 
* commit '05d455ca2b83793a81aac2544c388eec8ac140cd':
  Sanitize display names, keep extensions intact.
 2014-12-01 20:00:32 +00:00
John Spurlock
aac7a9f4c7 am 34c9ee1a: am 23a99a3a: am 21d68f48: Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev 
* commit '34c9ee1af8980594df096e7759c50277270e658c':
  Volume: Improve inline volume controls used in settings.
 2014-12-01 19:54:45 +00:00
Chet Haase
0d52d01ece am fd942b50: am 8394e9ff: am 21871444: Merge "Zero duration animations snap to end value when started" into lmp-mr1-dev 
* commit 'fd942b50f120a4530906268ab68ae2ddd4efde01':
  Zero duration animations snap to end value when started
 2014-12-01 19:54:35 +00:00
John Spurlock
fc6020c8a9 am f1832e24: am 64e034e3: am e3f8b314: Merge "Zen: Improve zen mode panel condition selection." into lmp-mr1-dev 
* commit 'f1832e2444d746dae25e64e4f91bd1dc6d2329ce':
  Zen: Improve zen mode panel condition selection.
 2014-12-01 19:54:22 +00:00
John Spurlock
34c9ee1af8 am 23a99a3a: am 21d68f48: Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev 
* commit '23a99a3ab09d90e3613b44a0962de7ed0028d620':
  Volume: Improve inline volume controls used in settings.
 2014-12-01 19:47:58 +00:00
Chet Haase
fd942b50f1 am 8394e9ff: am 21871444: Merge "Zero duration animations snap to end value when started" into lmp-mr1-dev 
* commit '8394e9fff32c8935e021f0e4e84c5c1de913b96f':
  Zero duration animations snap to end value when started
 2014-12-01 19:47:15 +00:00
John Spurlock
f1832e2444 am 64e034e3: am e3f8b314: Merge "Zen: Improve zen mode panel condition selection." into lmp-mr1-dev 
* commit '64e034e351ad73b9cb99cb04511d0fea137c7a3b':
  Zen: Improve zen mode panel condition selection.
 2014-12-01 19:46:50 +00:00
Narayan Kamath
d198c3269a am 53651b99: am ff45e7df: am 1d184ace: resolved conflicts for merge of 7377998d to lmp-mr1-dev 
* commit '53651b9982f53236b767d766e85ec0ce3acc6f0f':
  Be increasingly aggressive about fstrim if it isn't being run
 2014-12-01 19:37:59 +00:00
Narayan Kamath
53651b9982 am ff45e7df: am 1d184ace: resolved conflicts for merge of 7377998d to lmp-mr1-dev 
* commit 'ff45e7df8aae0f55ce719de92102c7d522b62048':
  Be increasingly aggressive about fstrim if it isn't being run
 2014-12-01 19:32:12 +00:00
Alan Viverette
53644fb5ac am 015b9e56: Merge "Cancel dialog when TimePickerDialog\'s BUTTON_NEGATIVE is clicked" into lmp-mr1-dev 
* commit '015b9e56d4ad528dd406672ef6264c85e41a20fd':
  Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked
 2014-12-01 19:17:30 +00:00
Alan Viverette
015b9e56d4 Merge "Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked" into lmp-mr1-dev 2014-12-01 19:12:49 +00:00
Jeff Sharkey
05d455ca2b am b9ccc047: Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev 
* commit 'b9ccc047ca9c1cd4f1c0143f230a4005fa4864a4':
  Sanitize display names, keep extensions intact.
 2014-12-01 19:00:56 +00:00
Jeff Sharkey
0cce5355b4 Sanitize display names, keep extensions intact. 
When creating or renaming files on external storage, sanitize the
requested display names to be valid FAT filenames.  This also fixes
a handful of directory traversal bugs.

Also relax logic around generating display names to allow any
extension which maps to the requested MIME type.  Tests to verify.

Bug: 18512473, 18504132
Change-Id: I89e632019ee145f53d9d9d2050932f8939a756af
 2014-12-01 09:38:49 -08:00
John Spurlock
23a99a3ab0 am 21d68f48: Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev 
* commit '21d68f4808db02aa3252ba5dec8b0220d053cab3':
  Volume: Improve inline volume controls used in settings.
 2014-12-01 17:11:21 +00:00
John Spurlock
21d68f4808 Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev 2014-12-01 17:06:14 +00:00
Chet Haase
8394e9fff3 am 21871444: Merge "Zero duration animations snap to end value when started" into lmp-mr1-dev 
* commit '2187144408dbdb5322a2212fa2e68a5891ea60ca':
  Zero duration animations snap to end value when started
 2014-12-01 15:58:46 +00:00
Chet Haase
2187144408 Merge "Zero duration animations snap to end value when started" into lmp-mr1-dev 2014-12-01 15:52:59 +00:00
John Spurlock
64e034e351 am e3f8b314: Merge "Zen: Improve zen mode panel condition selection." into lmp-mr1-dev 
* commit 'e3f8b31466f45eb4d5c9971049b71215a9f2c8a4':
  Zen: Improve zen mode panel condition selection.
 2014-12-01 15:04:02 +00:00
John Spurlock
e3f8b31466 Merge "Zen: Improve zen mode panel condition selection." into lmp-mr1-dev 2014-12-01 14:59:05 +00:00
Chet Haase
5a25e5bae2 Zero duration animations snap to end value when started 
A recent change to seeking behavior altered the logic of
setCurrentPlayTime() (which is called when animations are first
started) to set the current animated fraction to 0 for 0-duration
animations. This fix ensures that 0-duration animations snap to
their end value (fraction == 1) instead, matching the behavior
prior to the seeking fix.

Issue #18542543 Animations with 0 duration stay in initial state when calling setCurrentPlayTime(0)

Change-Id: I9916d962cf46453a9e3e1207f58baf16f4a5830a
 2014-12-01 06:57:15 -08:00
Craig Mautner
8bbcd72c8b am b97f7190: am fac55682: am 208bd91b: Merge "[ActivityManager] Avoid system server crash due to package removed" 
* commit 'b97f719036b15c81aeb561ae0d2b4da68e7a06e8':
  [ActivityManager] Avoid system server crash due to package removed
 2014-12-01 05:33:32 +00:00
Craig Mautner
b97f719036 am fac55682: am 208bd91b: Merge "[ActivityManager] Avoid system server crash due to package removed" 
* commit 'fac55682148e6d9c6b4e24769369e2b76ab018ac':
  [ActivityManager] Avoid system server crash due to package removed
 2014-12-01 05:26:47 +00:00
Craig Mautner
208bd91b24 Merge "[ActivityManager] Avoid system server crash due to package removed" 2014-12-01 00:11:52 +00:00
John Spurlock
3e07701636 Zen: Improve zen mode panel condition selection. 
- Decouple condition requests from expansion, now
   pre-request when zen panel unhidden.
 - Animate zen mode panel expansion.
 - Improve default selection logic, ensure something
   is selected as soon as we are in the expanded state.
 - Tweak visual spacing.
 - Map null condition to Indef properly when we start
   out in zen.
 - Avoid unnecessary condition teardown when the conditions
   are updated but unchanged from current.
 - Cap number of optional conditions to display, default=3.

Bug: 18335618

Change-Id: I007b7c3b2e75e2b42805af240684aa8581e9951a
 2014-11-30 10:41:33 -05:00
John Spurlock
bcc1087af4 Volume: Improve inline volume controls used in settings. 
- Make the system internal ringer mode change signal available to
   other system components via a standard intent, instead of a
   volume-controller-only binder call.
 - Update sysui to use new intent for icon policy.
 - Add proper muting state to the volumizer, to look more like
   the associated volume panel slider.
 - Add basic ringer mode state tracking for the notification-ring
   slider setting.

Bug: 17899613
Change-Id: Ie2df52edb070055ef59c74039162a0e785d2fdbb
 2014-11-28 15:29:21 -05:00
Narayan Kamath
24009c1b87 am f1459604: am ed2c9c60: am 10a36fb7: Merge "Stop using ErrorStrings for apache." 
* commit 'f1459604392dc0416500e149f1bafa11139dcfcc':
  Stop using ErrorStrings for apache.
 2014-11-27 18:09:40 +00:00
Narayan Kamath
f145960439 am ed2c9c60: am 10a36fb7: Merge "Stop using ErrorStrings for apache." 
* commit 'ed2c9c6029b18df9c25d6c98c909ac5f300d6ab1':
  Stop using ErrorStrings for apache.
 2014-11-27 18:03:15 +00:00
Narayan Kamath
f1a9b1bc24 Stop using ErrorStrings for apache. 
These strings only ever end up in logcat (at best), so there's no
point having them translated. Also, rename the ErrorStrings class
and move it android.webkit where the last remaining caller lives.

(congrats webview people, this is now your mess to maintain.)

Change-Id: I04dae37c34191b26a69282970318c1b782af1edf
 2014-11-27 17:23:41 +00:00
Ignacio Solla
03c76e2b55 Merge "[WebView] Remove fallback call to WebViewFactoryProvider no-arg constructor." 2014-11-27 15:28:01 +00:00
Narayan Kamath
0f4a1abc39 am d534645b: am bedb1378: am 8036d2ec: Merge "Delete general sounding "CharArrayBuffers" class." 
* commit 'd534645bab608bbee1ec6e9e72d10b88c53c023f':
  Delete general sounding "CharArrayBuffers" class.
 2014-11-27 14:15:22 +00:00
Narayan Kamath
d534645bab am bedb1378: am 8036d2ec: Merge "Delete general sounding "CharArrayBuffers" class." 
* commit 'bedb13782a6beb5f15621915a7b68439c6649ced':
  Delete general sounding "CharArrayBuffers" class.
 2014-11-27 14:10:03 +00:00
Narayan Kamath
b8b6e1f8f1 am 5445d3de: am f0c22b0c: am 14e28134: Merge "Delete unused class from android.net.http." 
* commit '5445d3de90fd28ba8e096a109a242615bb8222d3':
  Delete unused class from android.net.http.
 2014-11-27 14:01:23 +00:00
Narayan Kamath
5445d3de90 am f0c22b0c: am 14e28134: Merge "Delete unused class from android.net.http." 
* commit 'f0c22b0c72c8fbd5ce507419adda0670871a07bf':
  Delete unused class from android.net.http.
 2014-11-27 13:55:02 +00:00
Narayan Kamath
0ea4e7b581 Delete general sounding "CharArrayBuffers" class. 
Move the code to the only point of use. Preparatory work for
decoupling apache-http from the frameworks.

Change-Id: Ieee54bb725cbac19d0c7513867635df6fbcf2b49
 2014-11-27 13:52:11 +00:00
Narayan Kamath
3ec2def9a3 Delete unused class from android.net.http. 
Foundation for moving a lot of these classes out of the frameworks
and @removing these APIs.

Change-Id: I590cdd2867b923533de189ec956b4dd3f82efa46
 2014-11-27 12:52:48 +00:00
Narayan Kamath
ff45e7df8a am 1d184ace: resolved conflicts for merge of 7377998d to lmp-mr1-dev 
* commit '1d184acefa7105592134edebf7de4d77843d5791':
  Be increasingly aggressive about fstrim if it isn't being run
 2014-11-27 10:09:46 +00:00
Narayan Kamath
1d184acefa resolved conflicts for merge of 7377998d to lmp-mr1-dev 
Change-Id: I21870e241de7d992e97d7b91e0058f85b5a25fbe
 2014-11-27 09:57:35 +00:00
Eino-Ville Talvala
223661ec98 am 3eb27d25: am ec26692d: am 9b35b801: Merge "CameraManager: Separate service listener into a singleton" into lmp-mr1-dev 
* commit '3eb27d253b609fdce8b6e0e9aa4662631d52a0ce':
  CameraManager: Separate service listener into a singleton
 2014-11-27 00:38:17 +00:00
Eino-Ville Talvala
3eb27d253b am ec26692d: am 9b35b801: Merge "CameraManager: Separate service listener into a singleton" into lmp-mr1-dev 
* commit 'ec26692d1f65cf04963d8412e3e3bdd0d42796ea':
  CameraManager: Separate service listener into a singleton
 2014-11-27 00:33:09 +00:00
Eino-Ville Talvala
ec26692d1f am 9b35b801: Merge "CameraManager: Separate service listener into a singleton" into lmp-mr1-dev 
* commit '9b35b801fb90e31c1dff5535715e505f3a1e26fb':
  CameraManager: Separate service listener into a singleton
 2014-11-27 00:27:36 +00:00
Eino-Ville Talvala
9b35b801fb Merge "CameraManager: Separate service listener into a singleton" into lmp-mr1-dev 2014-11-27 00:23:42 +00:00