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

159431 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
b2d7ca7c6f am fd2c1307: Merge "Fix build." 
* commit 'fd2c1307e66573c398ff53eab25ee82735277091':
  Fix build.
 2015-02-04 20:31:45 +00:00
Elliott Hughes
fd2c1307e6 Merge "Fix build." 2015-02-04 20:26:03 +00:00
Elliott Hughes
f953ca2ec8 Fix build. 
Change-Id: Ic14b6de7e7e58ce42ae4cc5ca945e4896e3b7b8f
 2015-02-04 12:24:21 -08:00
Christopher Ferris
ff6cebf0a6 am 4fb79d14: Merge "Fix comment according to review." 
* commit '4fb79d14bb6c81f72a92da85420090a05ec2c76d':
  Fix comment according to review.
 2015-02-04 19:15:47 +00:00
Christopher Ferris
4fb79d14bb Merge "Fix comment according to review." 2015-02-04 19:07:15 +00:00
Christopher Ferris
7254c123a1 Fix comment according to review. 
Change-Id: I784f2051cd173425e9a9570ac4555cf835dd277d
 2015-02-04 10:40:12 -08:00
Craig Mautner
6112f63369 Merge "[ActivityManager] Prevent application holding AMS lock" 
automerge: 53e8d6f

* commit '53e8d6f934be403b9c7733c190b6052d60dd0658':
  [ActivityManager] Prevent application holding AMS lock
 2015-02-03 18:43:46 +00:00
Craig Mautner
53e8d6f934 Merge "[ActivityManager] Prevent application holding AMS lock" 2015-02-03 18:41:14 +00:00
Craig Mautner
7d1adede2f am 240e8743: Merge "[ActivityManager] Set appropriate relation of task to home" 
* commit '240e8743977d1a1e7a43ff42e0d52148db10cda8':
  [ActivityManager] Set appropriate relation of task to home
 2015-02-03 18:00:46 +00:00
Craig Mautner
240e874397 Merge "[ActivityManager] Set appropriate relation of task to home" 2015-02-03 17:54:27 +00:00
Craig Mautner
11c6f8b7c3 Merge "Remove fall through for KEYCODE_VOICE_ASSIST" 
automerge: 84533ed

* commit '84533edfc081f8dfa632ee1e49947b3d42f8a27d':
  Remove fall through for KEYCODE_VOICE_ASSIST
 2015-02-03 17:41:31 +00:00
Craig Mautner
84533edfc0 Merge "Remove fall through for KEYCODE_VOICE_ASSIST" 2015-02-03 17:36:54 +00:00
Robert Greenwalt
10d1609be9 am deef702e: Merge "Deutsche Telekom VVM free SMS shortcodes DE" 
* commit 'deef702e60f2f0aa9cf35a70bdf4c5e582799750':
  Deutsche Telekom VVM free SMS shortcodes DE
 2015-02-03 16:47:34 +00:00
Robert Greenwalt
deef702e60 Merge "Deutsche Telekom VVM free SMS shortcodes DE" 2015-02-03 16:44:02 +00:00
Henrik Baard
aa5c5e31de Remove fall through for KEYCODE_VOICE_ASSIST 
Removing unintentional fallthrough for the case
KEYCODE_VOICE_ASSIST.

The code works today since KEYCODE_VOICE_ASSIST is the
last case in the switch statement, however it is bad
practice. If somone adds another case statement the
code will break.

Change-Id: Iee6234807bbe176bd94e2584de288105d6c6a7cb
 2015-02-03 09:25:28 +01:00
Yang Ni
29fe5ef179 Merge "Pass in code cache directory when creating a script group." 
automerge: 9559ce7

* commit '9559ce7c1bd4451a470d6e1542659e726b0dce3d':
  Pass in code cache directory when creating a script group.
 2015-02-03 06:22:55 +00:00
Yang Ni
9559ce7c1b Merge "Pass in code cache directory when creating a script group." 2015-02-03 06:20:20 +00:00
Robert Greenwalt
0cdd4560da am fabf0e0b: Merge "Fixing up the formatting code which is already merged" 
* commit 'fabf0e0ba84e0cd28f459360b20386e68179cc31':
 2015-02-02 17:16:32 +00:00
Robert Greenwalt
fabf0e0ba8 Merge "Fixing up the formatting code which is already merged" 2015-02-02 17:00:43 +00:00
Robert Greenwalt
3c6e38d3b5 Fixing up the formatting code which is already merged 
I just apply google coding guide like space.

Uploading the same code about + handling just apply the Google Coding Guide.
The previous code is "https://android-review.googlesource.com/#/c/122770/"

This code is about + plus number converting logic for international NANP.

Change-Id: I23e4709294c603b387b28b3c2a56c932d838c666
 2015-02-02 15:04:56 +09:00
Lorenzo Colitti
5b392ee758 Merge "Also include the domain when parceling StaticIpConfiguration." 
automerge: c565a56

* commit 'c565a5675ac33d97d5c1caed7a5629412997fb4a':
  Also include the domain when parceling StaticIpConfiguration.
 2015-01-30 12:15:39 +00:00
Lorenzo Colitti
786deba636 Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" 
automerge: fba459d

* commit 'fba459d3457a0cb61bcb657c9fafadf0ccea27a9':
  Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
 2015-01-30 12:13:38 +00:00
Lorenzo Colitti
c565a5675a Merge "Also include the domain when parceling StaticIpConfiguration." 2015-01-30 07:07:49 +00:00
Lorenzo Colitti
fba459d345 Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" 2015-01-30 07:00:38 +00:00
Christopher Ferris
e7a69cbf92 am dbd03924: Merge "Fix wrap property creation when truncating." 
* commit 'dbd03924d83ab03e6e8e45d1d041dc8d162180cf':
  Fix wrap property creation when truncating.
 2015-01-29 23:51:16 +00:00
Christopher Ferris
dbd03924d8 Merge "Fix wrap property creation when truncating." 2015-01-29 23:41:06 +00:00
Christopher Ferris
e32df45fe1 Fix wrap property creation when truncating. 
If a property name gets truncated, make sure it doesn't end in a '.'
since that makes the name illegal.

Bug: 19196358
Bug: https://code.google.com/p/android/issues/detail?id=82947
Change-Id: Icc1a26593237ca19ad0ebd776a60b3d6290bb355
 2015-01-29 12:20:06 -08:00
Yang Ni
ebf63408d2 Pass in code cache directory when creating a script group. 
Change-Id: Ia73ea917a126a5055ec97f13d90a5feaafd6a2f5
 2015-01-29 08:46:46 -08:00
Lorenzo Colitti
d0cc544039 Also include the domain when parceling StaticIpConfiguration. 
StaticIpConfiguration objects are parceled at least as part of the
IpConfiguration objects that are passed to IEthernetManager when an
application sets static IP configuration on Ethernet.

Change-Id: I49991e2f591cc6cf01b503c18eb343b5929efe29
 2015-01-29 12:20:55 +00:00
Lorenzo Colitti
fb696894ee Merge "Support connecting to networks with misconfigured subnet masks." 
automerge: 106da5b

* commit '106da5bf80d182a2e6fd346e1836ae4fc0ba1d92':
  Support connecting to networks with misconfigured subnet masks.
 2015-01-29 08:37:58 +00:00
Lorenzo Colitti
106da5bf80 Merge "Support connecting to networks with misconfigured subnet masks." 2015-01-29 08:35:36 +00:00
Paul Jensen
b3b70975d9 Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties() 
setDomain() and toLinkProperties() were not setting the domains.
The setDomain() bug affected Wifi and I believe the toLinkProperties()
bug affected Ethernet and Bluetooth reverse-tethering.

(cherry picked from commit c53113b37f33c7ed19660c8ec5bfd578e8bb5409)

bug:18252947
Change-Id: I6235fcd6b875aee516efbb5f880db1a99380355b
 2015-01-29 17:12:35 +09:00
Lorenzo Colitti
8316b819b2 Support connecting to networks with misconfigured subnet masks. 
In K and earlier, we would connect to a network where the gateway
was not covered by the subnet mask of the IP address. This is an
invalid configuration, but it used to work, and other OSes appear
to accept it too, so support it.

Bug: 19067207

(cherry picked from commit 2dfb79a54adeb4bcf1f62332a9db467fce302ced)

Change-Id: I80088f291466dbd5a47f360dcc1620acee5cf57e
 2015-01-28 20:36:37 +09:00
Jason Sams
02236295a4 am 4dd0cf42: Merge "Initialize clipping structure" 
* commit '4dd0cf42f5941d9e25aa042bf75fa003b1f5ec76':
  Initialize clipping structure
 2015-01-27 20:48:04 +00:00
Jason Sams
4dd0cf42f5 Merge "Initialize clipping structure" 2015-01-27 20:41:43 +00:00
Marco Nelissen
3ea395ddc7 am 4e853598: Merge "Fix printf format" 
* commit '4e85359879cb417f0540a5cfbf91242ebd9546c7':
  Fix printf format
 2015-01-27 20:25:59 +00:00
Marco Nelissen
4e85359879 Merge "Fix printf format" 2015-01-27 20:19:46 +00:00
Marco Nelissen
6cd6110773 Fix printf format 
Change-Id: Ied2f10bb59fe0e13b23bf1f9913ab3b081348a28
 2015-01-27 12:17:48 -08:00
Marco Nelissen
99985d98c2 am e74da38e: Merge "Make SoundPool use MediaCodec" 
* commit 'e74da38e21a320528d0c94d076e59bd503c37623':
  Make SoundPool use MediaCodec
 2015-01-27 17:53:03 +00:00
Marco Nelissen
e74da38e21 Merge "Make SoundPool use MediaCodec" 2015-01-27 17:49:02 +00:00
Yabin Cui
f70492898b am 3812e68e: Merge "kill HAVE_PTHREADS." 
* commit '3812e68ea788782c54c27f69d08bcc1419066cb2':
  kill HAVE_PTHREADS.
 2015-01-27 06:54:06 +00:00
Yabin Cui
3812e68ea7 Merge "kill HAVE_PTHREADS." 2015-01-27 06:49:16 +00:00
Yabin Cui
1610486d37 kill HAVE_PTHREADS. 
Bug: 19083585
Change-Id: Ib466949bb6cd6d1bbc4680e989f0f9fae62ca564
 2015-01-26 22:32:38 -08:00
Jason Sams
14331ab1c3 Initialize clipping structure 
placeholder until array clipping is added to the API.

Change-Id: Ib20dbd71989c559c0669385a5088ec261596913c
 2015-01-26 18:15:05 -08:00
Elliott Hughes
86b48b3f80 Merge "Add missing <string.h> includes." 
automerge: 82a1a2c

* commit '82a1a2c63959adc0c7e3208c6ffa6985a346ae57':
  Add missing <string.h> includes.
 2015-01-25 19:21:31 +00:00
Elliott Hughes
82a1a2c639 Merge "Add missing <string.h> includes." 2015-01-25 19:17:42 +00:00
Elliott Hughes
35af2c3534 Add missing <string.h> includes. 
Change-Id: I188bfe1388fa49f6f79d247aa0d0f4fb089de503
 2015-01-25 08:33:36 -08:00
Marco Nelissen
372be8970c Make SoundPool use MediaCodec 
Bug: 18239054
Change-Id: Ia144fc1bbb0d2787638ee972e2224339b4965310
 2015-01-23 12:49:36 -08:00
Narayan Kamath
d555cd550d Merge "Remove superfluous OpenSSL include paths." 
automerge: fe24754

* commit 'fe24754fd69e75829c748b56e5806f1603835db9':
  Remove superfluous OpenSSL include paths.
 2015-01-23 10:50:41 +00:00
Narayan Kamath
fe24754fd6 Merge "Remove superfluous OpenSSL include paths." 2015-01-23 10:47:34 +00:00