Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
201,270 Commits 3 Branches 0 Tags
aeddd628645d669448ea25fb72f25d72602cd8ca
Commit Graph

201270 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tyler Gunn
aeddd62864 am ba945cc0: am f7c5c373: Merge "IMS: Map pay phone and unknown presentation with OIR." into mnc-dev 
* commit 'ba945cc0a55e14afb2cdc36483d98e4733a6869f':
  IMS: Map pay phone and unknown presentation with OIR.
 2015-06-29 23:58:30 +00:00
Tyler Gunn
ba945cc0a5 am f7c5c373: Merge "IMS: Map pay phone and unknown presentation with OIR." into mnc-dev 
* commit 'f7c5c373ab08bbd5aade14c4a94c4457558deb95':
  IMS: Map pay phone and unknown presentation with OIR.
 2015-06-29 23:45:25 +00:00
Tyler Gunn
f7c5c373ab Merge "IMS: Map pay phone and unknown presentation with OIR." into mnc-dev 2015-06-29 23:31:46 +00:00
Yang Ni
adc7c64f91 am 92dcbebc: am 0eba4019: Merge "Add Java doc comments on script group name reuse" 
* commit '92dcbebccc00566e1e0e824964ce2bea2e1b7d37':
  Add Java doc comments on script group name reuse
 2015-06-29 23:07:05 +00:00
Shriram Ganesh
ef0cde848b IMS: Map pay phone and unknown presentation with OIR. 
Current code does not map pay phone and unknown
presentation with OIR.
Add code to map pay phone and unknown presentation
with OIR correctly.

Bug: 22123243
Change-Id: I7610db8547a0f0f5529c2627879047dd9a45cf9f
 2015-06-29 15:54:54 -07:00
Yang Ni
92dcbebccc am 0eba4019: Merge "Add Java doc comments on script group name reuse" 
* commit '0eba40194e41c4f4a78a65041b3e736240b07b77':
  Add Java doc comments on script group name reuse
 2015-06-29 22:52:48 +00:00
Yang Ni
0eba40194e Merge "Add Java doc comments on script group name reuse" 2015-06-29 22:39:50 +00:00
Yang Ni
3020953243 Add Java doc comments on script group name reuse 
b/21999787

Change-Id: Id9a7bad4ce91f3afdd82a1288cf94430f3aef9bb
(cherry picked from commit dbb6fd58a4)
 2015-06-29 15:38:25 -07:00
Jean-Michel Trivi
b20151b496 am c1b30102: am 3a0d77f4: Merge "Volume change intent carries stream alias" into mnc-dev 
* commit 'c1b30102cc7feda09c52d7d857e892ad7ca7eb04':
  Volume change intent carries stream alias
 2015-06-29 22:37:29 +00:00
Jean-Michel Trivi
c1b30102cc am 3a0d77f4: Merge "Volume change intent carries stream alias" into mnc-dev 
* commit '3a0d77f42aa8bbc3e3f81bb80a55324fc686e2a7':
  Volume change intent carries stream alias
 2015-06-29 22:19:43 +00:00
Jean-Michel Trivi
3a0d77f42a Merge "Volume change intent carries stream alias" into mnc-dev 2015-06-29 22:11:35 +00:00
Yohei Yukawa
c8deda50fe am e564feba: am 4daf600e: Merge "Check system locale when picking up an initial SpellChecker." into mnc-dev 
* commit 'e564feba53f71610afb3bc995497e853654fb2d6':
  Check system locale when picking up an initial SpellChecker.
 2015-06-29 21:23:24 +00:00
Yang Ni
524d9b663d am f7e55607: am fd5ec27b: Merge "Add Java doc comments on script group name reuse" into mnc-dev 
* commit 'f7e5560703aa1e71f1e7603dfcd4f855a0377b31':
  Add Java doc comments on script group name reuse
 2015-06-29 21:23:18 +00:00
Yohei Yukawa
e564feba53 am 4daf600e: Merge "Check system locale when picking up an initial SpellChecker." into mnc-dev 
* commit '4daf600ee0fb9fbc70f224e92c73e49f44b2bbbb':
  Check system locale when picking up an initial SpellChecker.
 2015-06-29 20:49:13 +00:00
Yang Ni
f7e5560703 am fd5ec27b: Merge "Add Java doc comments on script group name reuse" into mnc-dev 
* commit 'fd5ec27bf95cca86008cd18bdd5a367eb00c7730':
  Add Java doc comments on script group name reuse
 2015-06-29 20:49:08 +00:00
Yohei Yukawa
4daf600ee0 Merge "Check system locale when picking up an initial SpellChecker." into mnc-dev 2015-06-29 20:42:54 +00:00
Yang Ni
fd5ec27bf9 Merge "Add Java doc comments on script group name reuse" into mnc-dev 2015-06-29 20:38:16 +00:00
John Spurlock
a6a9a9e2f6 am 4d6ac6ae: am c3409dd2: Merge "Volume: Force dismiss on ACTION_CLOSE_SYSTEM_DIALOGS." into mnc-dev 
* commit '4d6ac6ae30a5437e0ce8605141151721348ff2a7':
  Volume: Force dismiss on ACTION_CLOSE_SYSTEM_DIALOGS.
 2015-06-29 20:29:27 +00:00
Yusuke Sato
131b27b7b1 Merge "resolved conflicts for merge of d3d6e9a3 to mnc-dev-plus-aosp" into mnc-dev-plus-aosp 2015-06-29 20:21:06 +00:00
John Spurlock
4d6ac6ae30 am c3409dd2: Merge "Volume: Force dismiss on ACTION_CLOSE_SYSTEM_DIALOGS." into mnc-dev 
* commit 'c3409dd25353000fd8ba644e04caeba4dc08ea5f':
  Volume: Force dismiss on ACTION_CLOSE_SYSTEM_DIALOGS.
 2015-06-29 20:16:38 +00:00
Yusuke Sato
53a19bb967 resolved conflicts for merge of d3d6e9a3 to mnc-dev-plus-aosp 
Change-Id: Ie32db11e6c1062df32b16a5cd6fcd219e0bdc017
 2015-06-29 13:09:51 -07:00
John Spurlock
c3409dd253 Merge "Volume: Force dismiss on ACTION_CLOSE_SYSTEM_DIALOGS." into mnc-dev 2015-06-29 20:08:44 +00:00
Alan Viverette
1537e1358e am 4faa4cbb: am a1b647c8: Merge "Always remeasure ListView scrap used to obtain minimum width" into mnc-dev 
* commit '4faa4cbbca0c9027aa67063a2ad43f008628c5bb':
  Always remeasure ListView scrap used to obtain minimum width
 2015-06-29 20:04:39 +00:00
Alan Viverette
4faa4cbbca am a1b647c8: Merge "Always remeasure ListView scrap used to obtain minimum width" into mnc-dev 
* commit 'a1b647c8833cf85e304e3c201e7d0477b9838502':
  Always remeasure ListView scrap used to obtain minimum width
 2015-06-29 19:52:06 +00:00
Alan Viverette
a1b647c883 Merge "Always remeasure ListView scrap used to obtain minimum width" into mnc-dev 2015-06-29 19:39:29 +00:00
John Spurlock
bc7233a8a3 Volume: Force dismiss on ACTION_CLOSE_SYSTEM_DIALOGS. 
Use ACTION_CLOSE_SYSTEM_DIALOGS as an additional signal to immediately
dismiss the volume dialog, if showing.  Otherwise nav bar navigation
will not immediately dismiss the dialog.

Bug: 22173890
Change-Id: I3eee85a4579b4673b19402cf0f4048068009be35
 2015-06-29 15:34:18 -04:00
Christopher Tate
0515ad6ac0 am 1cd343f2: am 795d95ec: Merge "Throw DeadObjectException on failed transaction, not RuntimeException" into mnc-dev 
* commit '1cd343f28caf2bec6d17ce0857df3bd0d7720c1f':
  Throw DeadObjectException on failed transaction, not RuntimeException
 2015-06-29 19:19:56 +00:00
Christopher Tate
1cd343f28c am 795d95ec: Merge "Throw DeadObjectException on failed transaction, not RuntimeException" into mnc-dev 
* commit '795d95ecd7ad27fdd10f66113033ad98c4f5baf7':
  Throw DeadObjectException on failed transaction, not RuntimeException
 2015-06-29 19:09:22 +00:00
Christopher Tate
795d95ecd7 Merge "Throw DeadObjectException on failed transaction, not RuntimeException" into mnc-dev 2015-06-29 18:54:58 +00:00
Christopher Tate
ffd5864202 Throw DeadObjectException on failed transaction, not RuntimeException 
In practice we only see failed transactions with small payloads when
the remote dies while the binder operation is in flight.  Throw the
applicable exception type rather than the generic "oops binder went
haywire" one.

Bug 22104446

Change-Id: I785c15617db7a1f4d505aa11f16e61551c8357ba
 2015-06-29 11:52:23 -07:00
Wale Ogunwale
fd2b579bb7 am 0dfb1df6: am 810d5ed2: Merge "Use the correct lock to protect members in PolicyControl" into mnc-dev 
* commit '0dfb1df6ac373120208d72abf00a3817e343069c':
  Use the correct lock to protect members in PolicyControl
 2015-06-29 18:34:44 +00:00
Wale Ogunwale
0dfb1df6ac am 810d5ed2: Merge "Use the correct lock to protect members in PolicyControl" into mnc-dev 
* commit '810d5ed23b89265946d7f0fd8b2e6002038f1f2c':
  Use the correct lock to protect members in PolicyControl
 2015-06-29 18:22:03 +00:00
Wale Ogunwale
810d5ed23b Merge "Use the correct lock to protect members in PolicyControl" into mnc-dev 2015-06-29 18:13:06 +00:00
Yusuke Sato
d3d6e9a37e am 16d520fc: Merge "Rename ZipEntryName to ZipString" 
* commit '16d520fce6a3cecdc6b50e184a00b9585b86e512':
  Rename ZipEntryName to ZipString
 2015-06-29 18:01:14 +00:00
Yusuke Sato
16d520fce6 Merge "Rename ZipEntryName to ZipString" 2015-06-29 17:49:33 +00:00
Jean-Michel Trivi
560877d498 Volume change intent carries stream alias 
Define a new extra, AudioManager.EXTRA_VOLUME_STREAM_TYPE_ALIAS, to be
  sent along with the volume change intent, VOLUME_CHANGED_ACTION.
When sending VOLUME_CHANGED_ACTION, attach the stream type alias.

Bug 17955277

Change-Id: I04fd279e223504e3ee1581086d7e9205344a6808
 2015-06-29 10:44:16 -07:00
Jae Seo
96c23baff0 am 1d75e527: am 82b3f677: Merge "Use AlertDialog for MediaRouteControllerDialog" into mnc-dev 
* commit '1d75e5273e63de811363f22976ced24f629918ce':
  Use AlertDialog for MediaRouteControllerDialog
 2015-06-29 17:25:16 +00:00
Nicolas Prevot
d1d1a70050 am 64c0c4da: am 6fd49936: Merge "Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING" into mnc-dev 
* commit '64c0c4da555f6d38b9c2516f855b49e6b501b783':
  Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING
 2015-06-29 17:25:10 +00:00
Jae Seo
1d75e5273e am 82b3f677: Merge "Use AlertDialog for MediaRouteControllerDialog" into mnc-dev 
* commit '82b3f67711246ad5beaf7702ce16e9d433406d1e':
  Use AlertDialog for MediaRouteControllerDialog
 2015-06-29 17:16:50 +00:00
Nicolas Prevot
64c0c4da55 am 6fd49936: Merge "Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING" into mnc-dev 
* commit '6fd49936ae6b145cb2a9fe8b9ff75dcd79632daa':
  Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING
 2015-06-29 17:16:46 +00:00
Jae Seo
82b3f67711 Merge "Use AlertDialog for MediaRouteControllerDialog" into mnc-dev 2015-06-29 17:14:43 +00:00
Makoto Onuki
c561497116 am 08dfa1b4: am cadf3969: Merge "Notification for non-adopotable disks shouldn\'t be snoozed" into mnc-dev 
* commit '08dfa1b45633d55da2d3da045f076dc4a6b4d58a':
  Notification for non-adopotable disks shouldn't be snoozed
 2015-06-29 17:14:17 +00:00
Geoff Mendal
ea8f842fb8 am f07db677: (-s ours) am b05e2286: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'f07db6772496467cadc31832373c303d2363e05e':
  Import translations. DO NOT MERGE
 2015-06-29 17:14:12 +00:00
Nicolas Prevot
6fd49936ae Merge "Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING" into mnc-dev 2015-06-29 17:08:34 +00:00
Makoto Onuki
08dfa1b456 am cadf3969: Merge "Notification for non-adopotable disks shouldn\'t be snoozed" into mnc-dev 
* commit 'cadf3969c313bd0e354157eef9e0bcc552cb0c8a':
  Notification for non-adopotable disks shouldn't be snoozed
 2015-06-29 17:06:09 +00:00
Geoff Mendal
f07db67724 am b05e2286: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'b05e2286a9c4517480aca398fcc2e0ee55dfb6ed':
  Import translations. DO NOT MERGE
 2015-06-29 16:58:08 +00:00
Makoto Onuki
cadf3969c3 Merge "Notification for non-adopotable disks shouldn't be snoozed" into mnc-dev 2015-06-29 16:56:09 +00:00
Geoff Mendal
b05e2286a9 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-29 16:50:57 +00:00
Jason Monk
9117f34bea am 7b3550c0: am 435a1dfb: Merge "Fix weird case of multi cell icons" into mnc-dev 
* commit '7b3550c09a3e9c27ca8924721efe8efe1a316f48':
  Fix weird case of multi cell icons
 2015-06-29 16:46:32 +00:00
Geoff Mendal
cda214a1c3 Import translations. DO NOT MERGE 
Change-Id: Ia7c3e19454b5350971e62e79804cc45512436b98
Auto-generated-cl: translation import
 2015-06-29 09:45:56 -07:00