Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,037 Commits 3 Branches 0 Tags
813d974e33366aaeeb54e242e2767d4eeaf940dc
Commit Graph

177037 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
934f988117 am 63383c96: (-s ours) am 8f0d3694: (-s ours) Import translations. DO NOT MERGE 
* commit '63383c96a4766182b79412acb7642c4a38c357e6':
  Import translations. DO NOT MERGE
 2014-12-17 14:57:50 +00:00
Geoff Mendal
6641a0b5a2 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-17 14:53:39 +00:00
Geoff Mendal
63383c96a4 am 8f0d3694: (-s ours) Import translations. DO NOT MERGE 
* commit '8f0d3694f667263df6bed7b1c89df3911145437c':
  Import translations. DO NOT MERGE
 2014-12-17 14:51:23 +00:00
Geoff Mendal
c8be182061 Import translations. DO NOT MERGE 
Change-Id: I23edfacad6257591c34c9af3b18e6ed03d3e80e4
Auto-generated-cl: translation import
 2014-12-17 06:50:55 -08:00
Geoff Mendal
8f0d3694f6 Import translations. DO NOT MERGE 
Change-Id: Ib6806ea69f69ba66b4dc09a46b6e86d0ace3e734
Auto-generated-cl: translation import
 2014-12-17 06:44:29 -08:00
Narayan Kamath
1653b1dd69 Throw IllegalArgumentException on invalid hex-strings. 
Beats returning null since there's let's chance it will be interpreted
as the lack of a password.

Change-Id: I4986a8e806d9066129f696ab9f2e80655424e723
 2014-12-17 13:40:36 +00:00
Narayan Kamath
681e6df122 am 6d41504d: Merge "Move frameworks users over to libcore hex encoding API." 
* commit '6d41504d2c2111a55a4c06dd6b183318efd7c598':
  Move frameworks users over to libcore hex encoding API.
 2014-12-17 13:39:32 +00:00
Narayan Kamath
6d41504d2c Merge "Move frameworks users over to libcore hex encoding API." 2014-12-17 13:34:00 +00:00
Marcus Mueller-Jung
61cb6b09ce Deutsche Telekom VVM free SMS shortcodes DE 
The Deutsche Telekom “Mobilbox Pro” App (Visual Voicemail) uses SMS for
provision, these SMSs are free to the user, so the premium SMS notification
creates confusion. To avoid this notification, DTAG has harmonized two
short codes in Germany, 81214 and 81215, which are free in all German mobile
networks and should be whitelisted. Once whitelisted, these 2 codes will be
used by the client.

Change-Id: Id981b1d7abf83c2dc4a5846aa8a40b37e2e12409
Signed-off-by: Marcus Mueller-Jung <marcus.mueller-jung@telekom.de>
 2014-12-17 13:20:27 +00:00
Paul Jensen
05517814a5 am 24594794: am b0575a24: Merge "Fix race between CONNECTIVITY_ACTION and setting default network." into lmp-mr1-dev 
* commit '24594794cbb9bf6bb9c8b57e4427c88efee82304':
  Fix race between CONNECTIVITY_ACTION and setting default network.
 2014-12-17 13:05:39 +00:00
Paul Jensen
24594794cb am b0575a24: Merge "Fix race between CONNECTIVITY_ACTION and setting default network." into lmp-mr1-dev 
* commit 'b0575a24df6bc840d720dafa6e737cdd61fb2c6f':
  Fix race between CONNECTIVITY_ACTION and setting default network.
 2014-12-17 12:59:29 +00:00
Paul Jensen
b0575a24df Merge "Fix race between CONNECTIVITY_ACTION and setting default network." into lmp-mr1-dev 2014-12-17 12:54:16 +00:00
Christoph Studer
4328588cb5 am 3eff1e1f: am 92c411b2: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs 
* commit '3eff1e1f0e685e1dbb7e2621f5a8ab51a1c321d7':
  Fix MediaStyle docs mentioning 2 max actions in compact view
 2014-12-17 12:28:14 +00:00
Christoph Studer
3eff1e1f0e am 92c411b2: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs 
* commit '92c411b24eaa787158b19b209050ea35fc5070b6':
  Fix MediaStyle docs mentioning 2 max actions in compact view
 2014-12-17 12:22:33 +00:00
Christoph Studer
92c411b24e Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs 2014-12-17 12:16:48 +00:00
Jinsuk Kim
1481a42828 CEC: Pass port ID for set_audio_return_channel 
This CL passes a port ID when enabling/disabling ARC in case
there are multiple HDMI ports that support the feature.

Bug: 18781204

Change-Id: I632518132bf07c8ae6f0ff5135429ca719b596b2
 2014-12-17 17:29:08 +09:00
Joe Fernandez
ca27fb9711 am 6ff265cc: am df916a89: Merge "docs: studio revision 21 update" into lmp-docs 
* commit '6ff265cc882cd7512efcf4736b014ac27e77e5fe':
  docs: studio revision 21 update
 2014-12-17 02:58:28 +00:00
Joe Fernandez
e479dc219f am f9ea93cd: am 80287e76: Merge "docs: studio tools help monkey update" into lmp-docs 
* commit 'f9ea93cdc9791c71f39caeda71d9abc9a91e89d5':
  docs: studio tools help monkey update
 2014-12-17 02:58:25 +00:00
Joe Fernandez
93813012c0 am b8e29d01: am 740436b6: Merge "docs: help-adt link updates" into lmp-docs 
* commit 'b8e29d01fb6c7cbadacfd6ada6625dfdc79ec194':
  docs: help-adt link updates
 2014-12-17 02:58:20 +00:00
Sungsoo Lim
d0b09b04b8 am 31d592dc: am cd45de8b: Missing Javadoc update while API review 
* commit '31d592dc1cd9825c06c55562884be37f523350b3':
  Missing Javadoc update while API review
 2014-12-17 02:40:50 +00:00
Joe Fernandez
6ff265cc88 am df916a89: Merge "docs: studio revision 21 update" into lmp-docs 
* commit 'df916a89feba37f8d16bd61101d43be7d1667bf8':
  docs: studio revision 21 update
 2014-12-17 02:28:18 +00:00
Joe Fernandez
f9ea93cdc9 am 80287e76: Merge "docs: studio tools help monkey update" into lmp-docs 
* commit '80287e768fd40b61dc4e7b8a0394e1f732805dc9':
  docs: studio tools help monkey update
 2014-12-17 02:28:13 +00:00
Joe Fernandez
df916a89fe Merge "docs: studio revision 21 update" into lmp-docs 2014-12-17 02:21:50 +00:00
Joe Fernandez
80287e768f Merge "docs: studio tools help monkey update" into lmp-docs 2014-12-17 02:20:15 +00:00
Joe Fernandez
b8e29d01fb am 740436b6: Merge "docs: help-adt link updates" into lmp-docs 
* commit '740436b6767aac4c5409b3c9f42ca2606d5ed124':
  docs: help-adt link updates
 2014-12-17 01:55:29 +00:00
Joe Fernandez
740436b676 Merge "docs: help-adt link updates" into lmp-docs 2014-12-17 01:44:22 +00:00
Sungsoo Lim
31d592dc1c am cd45de8b: Missing Javadoc update while API review 
* commit 'cd45de8ba336d689500c7a65a6a21611cc73d537':
  Missing Javadoc update while API review
 2014-12-17 01:43:16 +00:00
Yorke Lee
41a42c73e6 am 50d8e5b0: am d3836e9d: Merge "Revert "Allow home to be pressed while in incoming call screen"" into lmp-mr1-dev 
* commit '50d8e5b0c067a532f893889ce58125233a12f7fc':
  Revert "Allow home to be pressed while in incoming call screen"
 2014-12-17 00:38:58 +00:00
Yorke Lee
50d8e5b0c0 am d3836e9d: Merge "Revert "Allow home to be pressed while in incoming call screen"" into lmp-mr1-dev 
* commit 'd3836e9df4ee0b22dd115e96abe976730263129d':
  Revert "Allow home to be pressed while in incoming call screen"
 2014-12-17 00:30:26 +00:00
Yorke Lee
d3836e9df4 Merge "Revert "Allow home to be pressed while in incoming call screen"" into lmp-mr1-dev 2014-12-17 00:17:02 +00:00
Sungsoo Lim
cd45de8ba3 Missing Javadoc update while API review 
Bug: 18550989
Change-Id: I766986fd429d58064fca6262a1c650cbcb19bddf
(cherry picked from commit 4e389e557e)
 2014-12-16 23:20:04 +00:00
Nancy Chen
aa4e271b9c am 799ff2ea: am ab4f36c0: Merge "Pass onPostDialChar call back from Telephony to Telecom." into lmp-mr1-dev 
* commit '799ff2ea099bdedf5b93630c2ab3cc362f022e70':
  Pass onPostDialChar call back from Telephony to Telecom.
 2014-12-16 23:19:25 +00:00
Nancy Chen
799ff2ea09 am ab4f36c0: Merge "Pass onPostDialChar call back from Telephony to Telecom." into lmp-mr1-dev 
* commit 'ab4f36c0df73bbe583a16eaa960401fd3f9c0db8':
  Pass onPostDialChar call back from Telephony to Telecom.
 2014-12-16 23:10:45 +00:00
Nancy Chen
ab4f36c0df Merge "Pass onPostDialChar call back from Telephony to Telecom." into lmp-mr1-dev 2014-12-16 23:06:29 +00:00
Tim Murray
501c710ec5 Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp 2014-12-16 21:43:02 +00:00
Tim Murray
d58370efc1 am 68a81bd8: am 8de16999: Merge "Fix typo with register native allocation." 
* commit '68a81bd8817e997cace3bedf8a013d2cdaff9daa':
  Fix typo with register native allocation.
 2014-12-16 21:42:54 +00:00
Tim Murray
d46f43f276 am fac7bfd6: am 6c02facd: Merge "Fix typo with register native allocation." into lmp-mr1-dev 
* commit 'fac7bfd6e4e6d8484b93afabc7fbd31968693a64':
  Fix typo with register native allocation.
 2014-12-16 21:42:18 +00:00
Cheuksan Wang
5cec9203a1 remove actions and calls for the old sms/mms api 
BUG: 18005911

Change-Id: Ifb900eb7f8bc03e205ac46d3dfb27e4baaaaf6b8
 2014-12-16 13:40:36 -08:00
Tim Murray
68a81bd881 am 8de16999: Merge "Fix typo with register native allocation." 
* commit '8de169993f0078bfdd064499c48b9d124cb438be':
  Fix typo with register native allocation.
 2014-12-16 21:36:43 +00:00
Tim Murray
fac7bfd6e4 am 6c02facd: Merge "Fix typo with register native allocation." into lmp-mr1-dev 
* commit '6c02facd83f1fa1ebf11d9cfda9872232c2d2d15':
  Fix typo with register native allocation.
 2014-12-16 21:36:37 +00:00
Tim Murray
6c02facd83 Merge "Fix typo with register native allocation." into lmp-mr1-dev 2014-12-16 21:33:03 +00:00
Tim Murray
8de169993f Merge "Fix typo with register native allocation." 2014-12-16 21:30:58 +00:00
Jeff Davidson
a20ca67d94 Add global setting for ephemeral network timeout. 
Bug: 18637384
Change-Id: I6bde3c9eef12caf2cc51c449abffc1c69f60c17f
 2014-12-16 13:30:06 -08:00
Rich Slogar
7749dede45 docs: plugin reference update 
Change-Id: Icb7881b990ce49f04d2c09d8b9ebcdb4c3db318e
 2014-12-16 13:21:56 -08:00
Christopher Tate
7c1f995b7b am 892e65cb: am 0dab4dc0: Fix bad alarm delivery 
* commit '892e65cb2ac4b4917b41060300bbaa3414233394':
  Fix bad alarm delivery
 2014-12-16 21:13:25 +00:00
Christopher Tate
892e65cb2a am 0dab4dc0: Fix bad alarm delivery 
* commit '0dab4dc03d1daae72bba9d364e15f6055cb339fd':
  Fix bad alarm delivery
 2014-12-16 21:07:54 +00:00
Christopher Tate
be3206ecdc am 5c3e277f: Fix bad alarm delivery 
* commit '5c3e277fb42bd799287936c5aee0d30fbcc7e65c':
  Fix bad alarm delivery
 2014-12-16 21:04:56 +00:00
Ying Wang
cd69b5a2de am 49b2f00a: am c80c12dd: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE." 
* commit '49b2f00acf8eca17bd6dbffc45a5bd1b4a2d525e':
  Cleanup Obsolete LOCAL_PRELINK_MODULE.
 2014-12-16 20:57:35 +00:00
Christopher Tate
0dab4dc03d Fix bad alarm delivery 
The man bent over his hourglass,
A programmer of sorts. The day was green.

They said, "You have a blue hourglass,
You do not fire alarms when they're asked."

The man replied, "Alarms as they're asked
are changed within the blue hourglass."

And they said then, "But fire, you must
Alarms beyond us, yet themselves,

Alarms within the blue hourglass
That trigger exactly when they're asked."

 ---

Fix the delivery-fuzzing semantics that had been introduced in
81f9882b5a.  That patch turned out
to be incomplete; in particular, alarms scheduled later might require
the validity of an already-scheduled kernel alarm even if they did
not affect the head alarm batch directly, and this was not being
addressed.  For now, roll back the fuzzed delivery logic entirely.
(This is not a full revert because that patch also caused exact alarms
to be considered standalone for batching purposes, and we need to
preserve that new policy.)

Bug 18726690
Bug 18765436

This is a 'git revert' of 81f9882b5a
*except* that this CL preserves the "exact alarms are treated as
standalone" portion of the original patch.

(Cherrypick of 5c3e277fb4 from its
original branch.)

Change-Id: Ib9c3200f7e6bc6fa0c9928ee9db4cfd87f039353
 2014-12-16 12:54:49 -08:00
Nancy Chen
27d1c2d148 Pass onPostDialChar call back from Telephony to Telecom. 
Add plumbing to alert Telecom every time a character is processed after
the post dial wait state (the processing happens in Telephony).

Bug: 18644688
Change-Id: I487d76aa9c959ca528c6377374aa35c2d0b4a803
 2014-12-16 12:53:04 -08:00