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

8931 Commits

Author SHA1 Message Date
Jeff Tinker
2670d5ad59 Merge "Fix Crash when sending null in HashMap to getKeyRequest" 2014-11-20 23:29:08 +00:00
Dan Albert
47249598cb am 582bdf9a: am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t." 
* commit '582bdf9a5961a32de27556832e23e0611c4d1cbb':
  Add appropriate casts for char16_t.
 2014-11-20 23:19:06 +00:00
Dan Albert
582bdf9a59 am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t." 
* commit 'd8c169fedf883491e46b354484909694fd52cfaf':
  Add appropriate casts for char16_t.
 2014-11-20 23:00:56 +00:00
Dan Albert
6698749dd4 Add appropriate casts for char16_t. 
C++11 defines a real char16_t, which is not implicitly convertible to
uint16_t (and by extension jchar). Add casts as needed.

Bug: 18300613
Change-Id: I00752002ef2e938bdb57f70947e8fd53ec103293
 2014-11-20 11:47:40 -08:00
Jeff Tinker
5bec026635 Fix Crash when sending null in HashMap to getKeyRequest 
Merge of partner https://android-review.googlesource.com/#/c/115665

Change-Id: I50235dc09be584165155019a70708377ca9688a0
 2014-11-20 18:39:59 +00:00
Jae Seo
8923735f28 am e0177a28: am 59f79d9b: am 3a9a53cb: Merge "TIF: make the tune request handling more efficient" into lmp-mr1-dev 
* commit 'e0177a28a342bac14edfc4dc502603b886eea193':
  TIF: make the tune request handling more efficient
 2014-11-18 20:21:55 +00:00
John Spurlock
1b9057169e am 3e846cb5: am 313ec49f: am ce66d35f: Merge "Volume: Don\'t allow ringer volume of 0 exiting ringer mode." into lmp-mr1-dev 
* commit '3e846cb53c6f6983e5309a4a8d5a1b54a1ac3d7c':
  Volume: Don't allow ringer volume of 0 exiting ringer mode.
 2014-11-18 20:21:45 +00:00
Jae Seo
e0177a28a3 am 59f79d9b: am 3a9a53cb: Merge "TIF: make the tune request handling more efficient" into lmp-mr1-dev 
* commit '59f79d9b2516abdebc99ce2a673fd4411a745f66':
  TIF: make the tune request handling more efficient
 2014-11-18 18:22:22 +00:00
John Spurlock
3e846cb53c am 313ec49f: am ce66d35f: Merge "Volume: Don\'t allow ringer volume of 0 exiting ringer mode." into lmp-mr1-dev 
* commit '313ec49f32c9a387abdae5157b2b75c31173831f':
  Volume: Don't allow ringer volume of 0 exiting ringer mode.
 2014-11-18 18:22:10 +00:00
Jae Seo
3a9a53cb75 Merge "TIF: make the tune request handling more efficient" into lmp-mr1-dev 2014-11-18 18:01:47 +00:00
John Spurlock
95ef08b348 Volume: Don't allow ringer volume of 0 exiting ringer mode. 
For any device with vibration, not only voice-capable devices.

Bug: 18423530
Change-Id: I0f1a7df884d675e6bc6854dcf044426c07f3d2f7
 2014-11-18 10:51:39 -05:00
Dongwon Kang
c918172508 TIF: make the tune request handling more efficient 
- Clear the pending tune operations to handle consecutive tune requests
  efficiently.
- Add time out for onTune() to make developers not to handle whole tune
  process in the onTune() method.

Bug: 18179595
Change-Id: I571e55b78d7c4d17c7237c5ce70203941bec2130
 2014-11-18 15:49:08 +09:00
Marco Nelissen
e726680652 am 52e2b6f7: Merge "Update calls to IInterface::asBinder()" 
* commit '52e2b6f79d44ff289c97653edea0548352c2f55b':
  Update calls to IInterface::asBinder()
 2014-11-17 18:24:54 +00:00
Marco Nelissen
97069dd4fd Update calls to IInterface::asBinder() 
to use the new static version.

Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a
 2014-11-17 10:05:31 -08:00
Marco Nelissen
dce97407dc Update calls to IInterface::asBinder() 
to use the new static version.

Change-Id: I88ee037c66aa254f466d3a51ddc358bd37cf44b5
 2014-11-14 14:02:09 -08:00
Jeff Sharkey
afc506c54b am 670cf5c6: am 22c3f906: am 628d2606: Merge "Move ringtone redirection to MediaPlayer." into lmp-mr1-dev 
* commit '670cf5c663f4f17faafa9d4f7cf7209f68a02468':
  Move ringtone redirection to MediaPlayer.
 2014-11-14 19:16:38 +00:00
Jean-Michel Trivi
f46501680d am 3c922dd7: am 84c803f8: am 136f5415: Merge "Support for delayed audio focus" into lmp-mr1-dev 
* commit '3c922dd7f2c82ae09c5ccf5a7b3a338ef682fe65':
  Support for delayed audio focus
 2014-11-14 00:45:45 +00:00
Mike Lockwood
3733efc8c1 am b8cb45fd: am 01816640: am eb205b88: Merge "MTP: Update JNI for new packet getters" into lmp-mr1-dev 
* commit 'b8cb45fddf5618ca0e8e9b36368a729785599e7c':
  MTP: Update JNI for new packet getters
 2014-11-14 00:44:51 +00:00
Jeff Sharkey
670cf5c663 am 22c3f906: am 628d2606: Merge "Move ringtone redirection to MediaPlayer." into lmp-mr1-dev 
* commit '22c3f90639fa8d74de68a63b0a13412740580845':
  Move ringtone redirection to MediaPlayer.
 2014-11-14 00:02:58 +00:00
Jeff Sharkey
628d2606f7 Merge "Move ringtone redirection to MediaPlayer." into lmp-mr1-dev 2014-11-13 22:16:15 +00:00
Jeff Sharkey
3b566b8470 Move ringtone redirection to MediaPlayer. 
Way back in API 1 we defined Settings.System.DEFAULT_NOTIFICATION_URI
which redirects through SettingsProvider before finally ariving at
the real underlying ContentProvider, usually MediaStore.

With new SELinux rules, we're no longer allowing the system_server
to hold open FDs to shared storage devices, which causes these
proxied openFile() calls to fail.

To work around this, teach MediaPlayer to resolve the final ringtone
Uri without going through the system.

Bug: 18226181
Change-Id: I40c68617c952c0bb3e939e5084f5b68a35e31ae3
 2014-11-13 13:52:41 -08:00
Jean-Michel Trivi
3c922dd7f2 am 84c803f8: am 136f5415: Merge "Support for delayed audio focus" into lmp-mr1-dev 
* commit '84c803f85db1117e1a31e74aa46f9089a3b54cf5':
  Support for delayed audio focus
 2014-11-13 19:03:43 +00:00
Jean-Michel Trivi
136f54153e Merge "Support for delayed audio focus" into lmp-mr1-dev 2014-11-13 18:47:34 +00:00
Mike Lockwood
b8cb45fddf am 01816640: am eb205b88: Merge "MTP: Update JNI for new packet getters" into lmp-mr1-dev 
* commit '0181664081db2149aa465332c33c5cb413a4348c':
  MTP: Update JNI for new packet getters
 2014-11-13 18:01:55 +00:00
Mike Lockwood
9c803fa526 MTP: Update JNI for new packet getters 
Bug:18113092
Change-Id: I5d7473af1b57235fbc078c297a309e4a301c9fbd
 2014-11-13 09:40:42 -08:00
Dan Albert
45670c1dc5 am b28ff487: resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp 
* commit 'b28ff487fb6db4a44e4d18aa17d8253f00a63bb6':
  Move frameworks/base over to libc++.
 2014-11-12 21:31:33 +00:00
Dan Albert
b28ff487fb resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp 
Change-Id: If21bd328a5c8ea3474abfe624e910d4830c72dc9
 2014-11-12 13:24:42 -08:00
Dan Albert
ff1d8a6635 Move frameworks/base over to libc++. 
Bug: 15193147
Change-Id: I96109d2d383f0c8a4aaa611f29fcf887afb3c69e
 2014-11-12 11:22:20 -08:00
Jean-Michel Trivi
fd6ad747e6 Support for delayed audio focus 
New internal API for an audio focus requester to always enter
 the audio focus stack even if audio focus can't be granted
 immediately (e.g. during a phone call).
Remap the "no delay" interface to the new "requestAudioFocus"
 method signature and AIDL.

Bug 16010554

Change-Id: Iff91ddb0beb411cca1f8cf98300a9afc4178dc7f
 2014-11-11 17:07:45 -08:00
Chong Zhang
bc0636e560 am 7b1c33f7: am 00795e9e: Merge "return error MEDIA_ERROR_UNSUPPORTED when Range request fail" into lmp-mr1-dev automerge: 6610985 
* commit '7b1c33f7a498b954d4c098e9f1a367b2be395d83':
  return error MEDIA_ERROR_UNSUPPORTED when Range request fail
 2014-11-11 18:55:35 +00:00
Chong Zhang
7b1c33f7a4 am 00795e9e: Merge "return error MEDIA_ERROR_UNSUPPORTED when Range request fail" into lmp-mr1-dev 
automerge: 6610985

* commit '6610985c35683fbc2bd827df97bdd185fe67248b':
  return error MEDIA_ERROR_UNSUPPORTED when Range request fail
 2014-11-11 18:52:23 +00:00
Chong Zhang
00795e9edd Merge "return error MEDIA_ERROR_UNSUPPORTED when Range request fail" into lmp-mr1-dev 2014-11-11 18:33:21 +00:00
Andreas Gampe
baa73b056c am cba06c22: resolved conflicts for merge of 6957369d to lmp-mr1-dev-plus-aosp 
* commit 'cba06c2272c8bce7d10b2a7ee762d12043f3252a':
  Frameworks/base: Wall Werror in media/jni
 2014-11-11 04:02:22 +00:00
Andreas Gampe
cba06c2272 resolved conflicts for merge of 6957369d to lmp-mr1-dev-plus-aosp 
Change-Id: Ie3bd0e24c69c0c7ae500b8eb4a1198650e993a19
 2014-11-10 19:41:52 -08:00
Chong Zhang
8976a0954c return error MEDIA_ERROR_UNSUPPORTED when Range request fail 
Bug: 18235751
Change-Id: I4631daf50bb76b70dd740c45b628294ad1aa45e1
 2014-11-10 19:32:28 -08:00
Andreas Gampe
e51e91860f am 390854c4: am 538b00f6: Merge "Frameworks/base: Wall Werror in media/mca" 
* commit '390854c4906b4747df4b2713cbe624060b6c1b0b':
  Frameworks/base: Wall Werror in media/mca
 2014-11-11 02:44:00 +00:00
Andreas Gampe
6957369d13 Merge "Frameworks/base: Wall Werror in media/jni" 2014-11-11 02:30:00 +00:00
Andreas Gampe
390854c490 am 538b00f6: Merge "Frameworks/base: Wall Werror in media/mca" 
* commit '538b00f6e583dfd38f6e329ef6715fb72f924160':
  Frameworks/base: Wall Werror in media/mca
 2014-11-11 02:20:54 +00:00
Andreas Gampe
5a15d0d31b Frameworks/base: Wall Werror in media/jni 
Turn on -Wall -Werror in media/jni. Fix warnings.

Change-Id: I9da54ad379d8172ee535b52ee2b0637a2533f4e3
 2014-11-10 18:19:40 -08:00
Andreas Gampe
e5160e7e59 Frameworks/base: Wall Werror in media/mca 
Turn on -Wall -Werror in media/mca. Fix warnings.

Change-Id: I2a43df1d0639babe240b91942a5ea3f8babdef93
 2014-11-10 17:49:02 -08:00
Dan Stoza
ceb5bdf42a am 1437146a: am bb8a87f4: am d17793ea: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev 
* commit '1437146a3e63cd932a29116f032847d4585cb4cd':
  Add a BufferItem parameter to onFrameAvailable
 2014-11-07 20:03:49 +00:00
Dan Stoza
1437146a3e am bb8a87f4: am d17793ea: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev 
* commit 'bb8a87f48a9978d8faec11819d5fabbbc97cac47':
  Add a BufferItem parameter to onFrameAvailable
 2014-11-07 19:58:51 +00:00
Dan Stoza
d17793ea2a Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev 2014-11-07 19:44:34 +00:00
Jason Parks
05e095ae08 am e8d0fe98: am ae61ea93: am 220b65d2: am 94c3e3bf: Merge "Fix NPE for CTS." into lmp-sprout-dev 
* commit 'e8d0fe98a6d39c545467f679f0000b500ec7d341':
  Fix NPE for CTS.
 2014-11-07 04:12:06 +00:00
RoboErik
c4a4636cc2 am fcfe6f5c: am bd94aff2: Merge changes If4c38bfe,Id9878186 into lmp-mr1-dev automerge: b1d52e1 
* commit 'fcfe6f5c7e12548d20c31bcad4db5089d23b78d8':
  Update metadata artwork and uri docs
  skip MediaController callbacks if it's been unregistered
 2014-11-07 03:55:49 +00:00
Jason Parks
e8d0fe98a6 am ae61ea93: am 220b65d2: am 94c3e3bf: Merge "Fix NPE for CTS." into lmp-sprout-dev 
* commit 'ae61ea936ab2323419383993b09f2943787c299a':
  Fix NPE for CTS.
 2014-11-07 00:24:53 +00:00
RoboErik
fcfe6f5c7e am bd94aff2: Merge changes If4c38bfe,Id9878186 into lmp-mr1-dev automerge: b1d52e1 
* commit 'bd94aff236502f5b4fe19bd773a10d0fd1ccfe49':
  Update metadata artwork and uri docs
  skip MediaController callbacks if it's been unregistered
 2014-11-07 00:07:06 +00:00
Jason Parks
220b65d21d am 94c3e3bf: Merge "Fix NPE for CTS." into lmp-sprout-dev 
* commit '94c3e3bfcfe8d91283560082c737cb62e8d06742':
  Fix NPE for CTS.
 2014-11-07 00:05:47 +00:00
RoboErik
b1d52e1d20 Merge changes If4c38bfe,Id9878186 into lmp-mr1-dev 
* changes:
  Update metadata artwork and uri docs
  skip MediaController callbacks if it's been unregistered
 2014-11-06 21:20:19 +00:00
Jason Parks
de709869ae Fix NPE for CTS. 
The effect list can be empty and will return null
from native code. This fixes the CTS crash.

Bug: 18256010
Change-Id: Ifa552efc9de216993427115c001c7071c90403f1
 2014-11-06 14:08:52 -06:00