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

180094 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Wagner
177612335a Remove last mention of SkFontHost. 
SkFontHost is now almost removed from Skia, and nothing is left in it
which interests Android. Remove the last few references to it to aid
in final removal.

Change-Id: I7d59cf7e08bdd5b9c3923c9ffaf03b1cc2f9f7b4
 2015-01-15 14:16:46 -05:00
John Spurlock
e873e5f3f9 Merge "Update three remaining png-based status bar icons to vectors." 2015-01-15 16:39:19 +00:00
Nicolas Prevot
a55e3ed8bf am 97c18827: am 97f1ac01: am a9f9c4b9: Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-dev 
* commit '97c1882719437d4b4d8ce99d53ffc400975fdd5e':
  Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING
 2015-01-15 12:50:29 +00:00
Nicolas Prevot
97c1882719 am 97f1ac01: am a9f9c4b9: Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-dev 
* commit '97f1ac016b6c116dc2964ba60ffe1e405578756a':
  Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING
 2015-01-15 12:42:47 +00:00
Nicolas Prevot
97f1ac016b am a9f9c4b9: Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-dev 
* commit 'a9f9c4b90a8af25974bc74971efeafa521073df2':
  Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING
 2015-01-15 12:35:05 +00:00
Nicolas Prevot
a9f9c4b90a Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-dev 2015-01-15 12:28:13 +00:00
Narayan Kamath
b66fa17901 am 19039a63: am 2f7ae528: am a747d5e4: Merge "Fix unexpected language changes on SIM card insertion." 
* commit '19039a632b096647ecdc75692bfe178fbabe9a78':
  Fix unexpected language changes on SIM card insertion.
 2015-01-15 12:18:05 +00:00
Narayan Kamath
19039a632b am 2f7ae528: am a747d5e4: Merge "Fix unexpected language changes on SIM card insertion." 
* commit '2f7ae528093ef4434e4d6380df0803cf70359971':
  Fix unexpected language changes on SIM card insertion.
 2015-01-15 12:09:48 +00:00
Narayan Kamath
2f7ae52809 am a747d5e4: Merge "Fix unexpected language changes on SIM card insertion." 
* commit 'a747d5e47bef27acd18afda3ed43309ad5fab87b':
  Fix unexpected language changes on SIM card insertion.
 2015-01-15 12:02:15 +00:00
Narayan Kamath
a747d5e47b Merge "Fix unexpected language changes on SIM card insertion." 2015-01-15 11:53:32 +00:00
Narayan Kamath
7dc8d32fd2 Fix unexpected language changes on SIM card insertion. 
There are two separate issues here that need to be fixed, both
boil down to the fact that adding an imperative (userSetLocale)
to the Configuration is a bad idea. Because of this:

- We'd never persist the first user set configuration if it was en_US,
  because of an erroneous call to Configuration.setLocale.

- ActivityManager.getConfiguration would sometimes return a
  Configuration with userSetLocale == true, which means callers with
  the right permissions would inadvertently persist a locale they didn't
  want to persist.

bug: 18879010

(cherry picked from commit c63a16b8e46f2f3ecce6c548663cc3185f011fd6)

Change-Id: I4d714eb1f75afc0a5bf4d53a374df4ed16e328bf
 2015-01-15 11:50:55 +00:00
Jinsuk Kim
4305c1717c am b098c2dc: am 5304649b: am 2cd3ac47: Merge "CEC: Support sendStandby() for MHL device" into lmp-mr1-dev 
* commit 'b098c2dca478b73358cb6943a2277fb3e26d93ab':
  CEC: Support sendStandby() for MHL device
 2015-01-15 05:27:05 +00:00
Jinsuk Kim
b098c2dca4 am 5304649b: am 2cd3ac47: Merge "CEC: Support sendStandby() for MHL device" into lmp-mr1-dev 
* commit '5304649ba89c9ebdd792e83761f8f4098c6d6465':
  CEC: Support sendStandby() for MHL device
 2015-01-15 05:19:53 +00:00
Jinsuk Kim
5304649ba8 am 2cd3ac47: Merge "CEC: Support sendStandby() for MHL device" into lmp-mr1-dev 
* commit '2cd3ac4707f32fc296c0b2a8e7e2479d40c9a706':
  CEC: Support sendStandby() for MHL device
 2015-01-15 05:11:49 +00:00
Jinsuk Kim
2cd3ac4707 Merge "CEC: Support sendStandby() for MHL device" into lmp-mr1-dev 2015-01-15 05:07:04 +00:00
Brian Carlstrom
983223ad07 am 5baa164a: Restore write_delete_file 
* commit '5baa164aec06a9973a68303bc7752aa76e5c68e5':
  Restore write_delete_file
 2015-01-15 04:57:56 +00:00
Dianne Hackborn
e6eb0772d6 am fce232b4: am 5a4b4084: am b96a6916: Merge "Fix issue android-app doc, bump battery stats checkin version" into lmp-mr1-dev 
* commit 'fce232b4080a12220821568ab670a0cdce4893c5':
  Fix issue android-app doc, bump battery stats checkin version
 2015-01-15 04:57:52 +00:00
John Reck
f78ff7d49a am cefeb34e: am 2c9f86aa: am 53af1cd3: Merge "Vsyncs are hard" into lmp-mr1-dev 
* commit 'cefeb34e4866209e2ccf4c520919fe31a3f1aeb5':
  Vsyncs are hard
 2015-01-15 04:57:43 +00:00
Alan Viverette
d2052175eb am c83245be: am 628e646e: am aa229902: Merge "Jump ripples to end when switching to a non-hardware canvas" into lmp-mr1-dev 
* commit 'c83245be678608533ce53005f4149719f6dd5e03':
  Jump ripples to end when switching to a non-hardware canvas
 2015-01-15 04:57:39 +00:00
Brian Carlstrom
3a7ceec7d5 resolved conflicts for merge of da562f3d to master 
Change-Id: I168ffb910b5962ea53660d1901fa5a8045a9df28
 2015-01-14 20:49:37 -08:00
Brian Carlstrom
33d0392d3e Restore write_delete_file 
(cherry picked from commit 5baa164aec06a9973a68303bc7752aa76e5c68e5)

Change-Id: Ifa9a157346edd479ce03982baf435ab213dc2e79
 2015-01-14 20:39:26 -08:00
Christopher Tate
33194035a5 am 49138184: am 9568307c: am 43a4a8c7: Fix redundant file backups 
* commit '49138184dee54357b1923f302e4b3fedd73ca34f':
  Fix redundant file backups
 2015-01-15 04:30:34 +00:00
Chad Brubaker
f038345826 am b8794c76: Merge "resolved conflicts for merge of 3d64a850 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp 
* commit 'b8794c76d677ef04c96b9edc002fe6e1f53022c7':
  Generate IKeystoreService using aidl
 2015-01-15 03:45:12 +00:00
Stuart Scott
2a3e8c729d am e2b9d5b5: am 542f4ee6: am a2fa3d21: Merge "Unhide getDataRoaming, Messenger uses it to decide to download MMS or not." into lmp-mr1-dev 
* commit 'e2b9d5b56c6b06418e85cd49afd87e0d08f57c71':
  Unhide getDataRoaming, Messenger uses it to decide to download MMS or not.
 2015-01-15 03:45:04 +00:00
Michael Wright
70a4cb92f9 am 31572ede: am 5497e99c: am eec75faa: Merge "Clean up graphics resources." into lmp-mr1-dev 
* commit '31572ede1c85efccb8b876e4492f7a23a9b8e739':
  Clean up graphics resources.
 2015-01-15 03:44:59 +00:00
Craig Mautner
e08049bcd8 am c6267735: am f387d3c8: am c8ba2e87: Merge "Place window at top when adding by base layer" into lmp-mr1-dev 
* commit 'c626773562716168ce710320ce1e36d99fd6664a':
  Place window at top when adding by base layer
 2015-01-15 03:44:51 +00:00
Adam Lesinski
97611881e1 am 5c61dfc2: am e488ce86: am 94e30215: Merge "AAPT: Handle all old unversioned attribute usage" into lmp-mr1-dev 
* commit '5c61dfc25fed75a436dc32b0fb18854bde0c4cea':
  AAPT: Handle all old unversioned attribute usage
 2015-01-15 03:44:43 +00:00
Christoph Studer
61e13698a8 am 4d5e761a: am a80da9d0: am b018399a: SysUI: Log lockscreen gestures 
* commit '4d5e761a34c73a700757ade349e9a05b3335f617':
  SysUI: Log lockscreen gestures
 2015-01-15 02:57:09 +00:00
Brian Carlstrom
5baa164aec Restore write_delete_file 
Change-Id: Id93a59ae6c82f6068c58b22e2a651ff8a3b8f530
 2015-01-14 18:19:54 -08:00
Dianne Hackborn
fce232b408 am 5a4b4084: am b96a6916: Merge "Fix issue android-app doc, bump battery stats checkin version" into lmp-mr1-dev 
* commit '5a4b4084215b1efc5308c0c914185599b4d502bf':
  Fix issue android-app doc, bump battery stats checkin version
 2015-01-15 01:52:21 +00:00
Dianne Hackborn
5a4b408421 am b96a6916: Merge "Fix issue android-app doc, bump battery stats checkin version" into lmp-mr1-dev 
* commit 'b96a6916f657c4b3f5da7a5d2d8d32dee4d6167c':
  Fix issue android-app doc, bump battery stats checkin version
 2015-01-15 01:42:35 +00:00
John Reck
cefeb34e48 am 2c9f86aa: am 53af1cd3: Merge "Vsyncs are hard" into lmp-mr1-dev 
* commit '2c9f86aa21b8d7ea6a77eaca9a49ccdb31245129':
  Vsyncs are hard
 2015-01-15 01:39:50 +00:00
Alan Viverette
c83245be67 am 628e646e: am aa229902: Merge "Jump ripples to end when switching to a non-hardware canvas" into lmp-mr1-dev 
* commit '628e646eeae6147578428632d7c25326b8b7ef59':
  Jump ripples to end when switching to a non-hardware canvas
 2015-01-15 01:39:44 +00:00
Alan Viverette
da562f3d51 am cf1950aa: am 4490774b: Merge "Make the DatePicker dialog fit on smaller screens in landscape mode" into lmp-mr1-dev 
* commit 'cf1950aaabb50b4e851ce1c5fe6fde9f8c848473':
  Make the DatePicker dialog fit on smaller screens in landscape mode
 2015-01-15 01:39:37 +00:00
Christopher Tate
49138184de am 9568307c: am 43a4a8c7: Fix redundant file backups 
* commit '9568307cf32c8abc6703dc7a1b0b0fee56c4f8f5':
  Fix redundant file backups
 2015-01-15 01:39:29 +00:00
Dianne Hackborn
b96a6916f6 Merge "Fix issue android-app doc, bump battery stats checkin version" into lmp-mr1-dev 2015-01-15 01:38:23 +00:00
Mike Lockwood
dea9dbe631 Merge "MidiManager updates:" 2015-01-15 01:32:52 +00:00
John Reck
2c9f86aa21 am 53af1cd3: Merge "Vsyncs are hard" into lmp-mr1-dev 
* commit '53af1cd3930a398b2008c4be9c10e5182392ffaf':
  Vsyncs are hard
 2015-01-15 01:11:48 +00:00
Alan Viverette
628e646eea am aa229902: Merge "Jump ripples to end when switching to a non-hardware canvas" into lmp-mr1-dev 
* commit 'aa229902ef73f8777768414092eaf99eeff05f87':
  Jump ripples to end when switching to a non-hardware canvas
 2015-01-15 01:11:41 +00:00
John Reck
53af1cd393 Merge "Vsyncs are hard" into lmp-mr1-dev 2015-01-15 01:08:57 +00:00
Alan Viverette
aa229902ef Merge "Jump ripples to end when switching to a non-hardware canvas" into lmp-mr1-dev 2015-01-15 01:05:53 +00:00
Alan Viverette
a0c0ca7389 Jump ripples to end when switching to a non-hardware canvas 
Previously we canceled the hardware animations but neglected to reset
the state, which left us drawing in the pressed state.

Bug: 19020524
Change-Id: I439a18126b9093cac40006361be99f8d077b95a9
 2015-01-14 17:05:21 -08:00
Alan Viverette
cf1950aaab am 4490774b: Merge "Make the DatePicker dialog fit on smaller screens in landscape mode" into lmp-mr1-dev 
* commit '4490774bc10d575ce1da3ea98ef3e6bc1f37fed2':
  Make the DatePicker dialog fit on smaller screens in landscape mode
 2015-01-15 01:03:02 +00:00
Alan Viverette
4490774bc1 Merge "Make the DatePicker dialog fit on smaller screens in landscape mode" into lmp-mr1-dev 2015-01-15 00:58:38 +00:00
Alan Viverette
f39d650280 Make the DatePicker dialog fit on smaller screens in landscape mode 
Bug: 18933437
Change-Id: Id40351d52a7eab81e15e1f0120a9da961ef21d0a
 2015-01-14 16:58:05 -08:00
Mike Lockwood
10024b3dc1 MidiManager updates: 
MIDI ports are now implemented as file descriptors directly between the sender
and receiver, so the MidiService is no longer in the message path.

To facilitate the above, each port has its own file descriptor, rather than multiplexing
all ports on a device through a single socket.

Added a new class MidiDeviceServer, which is used by implementors of MIDI devices.
This replaces the MidiVirtualDevice class (which only was included in changes that were reviewed but never submitted).

The USB MIDI implementation has moved from the MIDI service to the USB service.
The USB MIDI implementation uses MidiDeviceServer as its interface, so we now have a common
interface for all MIDI device implementations.

Change-Id: I8effd1583f344beb6c940c3a24dbf20b477a6436
 2015-01-14 16:51:54 -08:00
Christopher Tate
9568307cf3 am 43a4a8c7: Fix redundant file backups 
* commit '43a4a8c777fbb8f71540ac7fbe82674489ef557b':
  Fix redundant file backups
 2015-01-15 00:49:46 +00:00
Christopher Tate
43a4a8c777 Fix redundant file backups 
We'd observed a bug in which an unchanged file was nevertheless
being redundantly transmitted for backup on every backup pass.
The underlying issue turns out to have been the FileBackupHelper
base implementation's logic for diffing the prior-state file
set against the current state, in the case when there had been
deletions of prior files.  In addition, there was also a
parallel bug in which file checksums were not calculated
properly in some cases, leading to at least one additional
redundant backup of the file in question.

Bug 18694053

Change-Id: Ie0dec06486b5fef4624561737019569c85d6b2a0
 2015-01-14 16:36:30 -08:00
Dianne Hackborn
0ee10f6d26 Fix issue android-app doc, bump battery stats checkin version 
Issue #18983662: API Reivew: clarify Intent docs for URI_ANDROID_APP_SCHEME
Issue #19019830: Bump up battery stats checkin version

Change-Id: I0bd8f32b9d8d5978bd01d421ea2232d20def340a
 2015-01-14 16:16:13 -08:00
Jorim Jaggi
568e54be71 resolve merge conflicts of 87f5369 to master. 
Change-Id: I5d1a7aaf48c4bf70f7181508aa46fbbcc2cf7086
 2015-01-15 00:12:18 +01:00