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

175607 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
ce171764a6 am fe279813: (-s ours) am 42acb728: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'fe279813264a4bd35450fdd4839a4924276df480':
  Import translations. DO NOT MERGE
 2014-11-26 19:43:00 +00:00
John Spurlock
ebf862cc5a am b20cdd3b: am 4a0e40a7: am f17f04a5: Merge "Volume: Avoid making bad forceVolumeControlStream call." into lmp-mr1-dev 
* commit 'b20cdd3b6be3cb76fd1bf74af111a3140362f125':
  Volume: Avoid making bad forceVolumeControlStream call.
 2014-11-26 19:42:56 +00:00
Geoff Mendal
a5d3798c61 am 06e83b3d: (-s ours) am d075d2f7: (-s ours) am 038c1444: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '06e83b3d5ac9a7ec43ddd0ea9d1bf40c13e35484':
  Import translations. DO NOT MERGE
 2014-11-26 19:42:52 +00:00
Jeff Davidson
0a978b13c8 am 228e2c26: am daa699ce: am 8c99018a: Merge "Handle package changes in NetworkScoreService." into lmp-mr1-dev 
* commit '228e2c262782d57a365a357a067bb53d13ff5eb9':
  Handle package changes in NetworkScoreService.
 2014-11-26 19:42:47 +00:00
Jeff Davidson
30d728346d am 48058077: am e5454d57: am f8a3b8e0: Merge "Fix WifiTile\'s Connected indicator for ephemeral networks." into lmp-mr1-dev 
* commit '480580775ee8b12a07a2f4714bc4751a502bb45b':
  Fix WifiTile's Connected indicator for ephemeral networks.
 2014-11-26 19:42:42 +00:00
Geoff Mendal
68fa35eb0b am 20dd9655: (-s ours) am 9641feee: (-s ours) am 38499cf8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '20dd965559e535271866dde7a682733bde7749b9':
  Import translations. DO NOT MERGE
 2014-11-26 19:42:38 +00:00
Geoff Mendal
9815e5ad92 am 2bf69143: (-s ours) am cb3a6f89: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '2bf691436b828b2a71d3d9dc917a3b43adfed73d':
  Import translations. DO NOT MERGE
 2014-11-26 19:42:33 +00:00
Geoff Mendal
2fe1ea16ef am ad9889bb: (-s ours) am 3efcd8da: (-s ours) am 441d4f04: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'ad9889bbd92454d960c638da04fa6a649bc3f6ef':
  Import translations. DO NOT MERGE
 2014-11-26 19:42:29 +00:00
Jorim Jaggi
ca389b259f am 199d621c: am f1b05619: am 95e89cae: Fix jank when pin/pattern is shown 
* commit '199d621c5fc994e323fa6b73c34729d48fc46c11':
  Fix jank when pin/pattern is shown
 2014-11-26 19:42:24 +00:00
Jorim Jaggi
7d754e0ccb am f1e6d231: am c5c2e537: Merge "resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev" into lmp-mr1-ub-dev 
* commit 'f1e6d2315eea6e9f289b8c1bafc04a4cbc6f05e1':
  Make IKeyguardService interface asynchronous
 2014-11-26 19:42:19 +00:00
Geoff Mendal
de4b545e0f am 63aa80f6: (-s ours) am 57086523: (-s ours) Import translations. DO NOT MERGE 
* commit '63aa80f6edadac1eaf245333f4762832d4cd0937':
  Import translations. DO NOT MERGE
 2014-11-26 19:42:15 +00:00
Paul Jensen
7062991686 am f19f90b2: am 58a493ac: am be3736d3: Merge "Don\'t let NetworkMonitor state stop user-initiated transitions." into lmp-mr1-dev 
* commit 'f19f90b229c9d15b33895988fd5e4e13d786f616':
  Don't let NetworkMonitor state stop user-initiated transitions.
 2014-11-26 19:42:10 +00:00
Jinsuk Kim
e63c222427 am e4d336eb: am 3052fede: am 1c72ba8a: Merge "CEC: Do not compare active input when updating" into lmp-mr1-dev 
* commit 'e4d336eb9542f59d9ab4d5bfb21ad4ce9fc5a83a':
  CEC: Do not compare active input when updating
 2014-11-26 19:42:06 +00:00
Andy Hung
c3b7ab50b7 am e3566007: am feeaa0ba: am f32d06d8: Merge "Allow set loop and position before write for static AudioTracks" into lmp-mr1-dev 
* commit 'e356600772be85c1170258fff2a516a31f896670':
  Allow set loop and position before write for static AudioTracks
 2014-11-26 19:42:02 +00:00
Dianne Hackborn
8d59b00ea8 am 5f84109c: am b3cf1136: am 4298db73: Merge "Re-tune low memory killer params." into lmp-mr1-dev 
* commit '5f84109caed8cb4bd2730a2fbb55dc7cee25022d':
  Re-tune low memory killer params.
 2014-11-26 19:41:57 +00:00
smain@google.com
df48876b3b am 804830f8: am 357efcd1: am ee032263: am 9da0881f: am 59f4624a: am be718f7c: Merge "add wear design guide for contextual apps" into lmp-docs 
* commit '804830f83c7df0c69ed784619e62e2293a31182f':
  add wear design guide for contextual apps
 2014-11-26 19:41:53 +00:00
Alan Viverette
2346a299a4 am 7c28a968: am c8361ba7: am 0a310c99: Merge "Revert "Animates AbsSeekBar progress movement from key presses."" into lmp-mr1-dev 
* commit '7c28a9682bfa2c5bbeee8b4a4c0576fea87eb9b0':
  Revert "Animates AbsSeekBar progress movement from key presses."
 2014-11-26 19:41:48 +00:00
Alan Viverette
a033bb9c73 am ed79856d: am 30c0d5b5: am 8a45126a: Merge "Load SPEAK_PASSWORD from currently active user rather than self" into lmp-mr1-dev 
* commit 'ed79856db292044a15fe7d3c3227fb9ec808f070':
  Load SPEAK_PASSWORD from currently active user rather than self
 2014-11-26 19:41:43 +00:00
Lajos Molnar
9bde6e419e am a181da10: Merge "Fix broken @see javadoc in android.media.* classes" into lmp-mr1-dev 
* commit 'a181da10ac5a7fc750d046e7789ba2244ee563b9':
  Fix broken @see javadoc in android.media.* classes
 2014-11-26 19:41:42 +00:00
Alan Viverette
1e28c2272f am 93ca215b: am 8311f4d5: am ee222182: Merge "Ensure time picker HH:MM header is laid out left-to-right" into lmp-mr1-dev 
* commit '93ca215bf4a4ab855a14fe1d4f06405da8c51f0d':
  Ensure time picker HH:MM header is laid out left-to-right
 2014-11-26 19:41:39 +00:00
vandwalle
b6c9cbc576 am 47772ac8: Merge "make startScan with worksource specific to location scans" into lmp-mr1-dev 
* commit '47772ac8e969fae53f8a3cef9066843fe20cae70':
  make startScan with worksource specific to location scans
 2014-11-26 19:41:36 +00:00
padarshr
be47db75e7 am 3eafd910: am 3e39c7f5: am e3c48e90: am ddd9c2b9: am 1586b9c3: Start MountService before performBootDexOpt 
* commit '3eafd910c9b167dc25d4fa899e7233811c038d0d':
  Start MountService before performBootDexOpt
 2014-11-26 19:41:35 +00:00
Jeff Sharkey
cd5d46ff81 am 293f0f38: Merge "package_info GID shouldn\'t have write." into lmp-mr1-dev 
* commit '293f0f380b514658f63474b714053fda0e92569f':
  package_info GID shouldn't have write.
 2014-11-26 19:41:31 +00:00
Alan Viverette
39319d1d4d am e5684843: am e6974e32: am 10e2700d: Merge "Ensure calling mutate() on DrawableContainer creates a new state" into lmp-mr1-dev 
* commit 'e56848431e31434f1d453222187a2e32f2e03e90':
  Ensure calling mutate() on DrawableContainer creates a new state
 2014-11-26 19:41:30 +00:00
Lajos Molnar
a181da10ac Merge "Fix broken @see javadoc in android.media.* classes" into lmp-mr1-dev 2014-11-26 19:14:26 +00:00
vandwalle
47772ac8e9 Merge "make startScan with worksource specific to location scans" into lmp-mr1-dev 2014-11-26 19:05:02 +00:00
Chris Craik
9f81485a76 Revert "Force-use the pbuffer surface for destroy" 
bug:18528859

This reverts commit b945f2313aee6e49a082ba5caaf95334d2570d52.

Change-Id: I6915624d356cb8570471eb3a5b8921f59b58db6d
 2014-11-26 18:59:58 +00:00
Jeff Sharkey
d76737a732 am b802cd67: Merge "APK still has privileged flag after being moved from "/system/priv-app"" 
* commit 'b802cd6767c43a85645279a67bb41320058fdb60':
  APK still has privileged flag after being moved from "/system/priv-app"
 2014-11-26 18:59:13 +00:00
Ignacio Solla
59565277d9 am c67b21fa: Merge "[WebView] Allow the WebView to be compiled against the system SDK." 
* commit 'c67b21fa3ff17a1003dc805bb456c41a98bdf964':
  [WebView] Allow the WebView to be compiled against the system SDK.
 2014-11-26 18:59:06 +00:00
Elliott Hughes
8e1bbfe0f1 Mention ProGuard in the JNI documentation. 
Change-Id: I7822ec1eca0290eba1f4b08eca6794b41172d606
 2014-11-26 10:51:37 -08:00
Jeff Sharkey
293f0f380b Merge "package_info GID shouldn't have write." into lmp-mr1-dev 2014-11-26 18:49:33 +00:00
Ryan Lothian
1e88cf0796 Fix broken @see javadoc in android.media.* classes 
This CL fixes all android.media.* javadoc that includes an "ERROR(...)"
message when rendered to HTML.

Bug: 18537403
Change-Id: Ic60f7cfe4cf4961da163d955387d65a5d2011905
(cherry picked from commit d550f9028ee7f52018fbed3cfd2d0b18d6a7c4f0)
 2014-11-26 18:49:01 +00:00
Ryan Lothian
22d93b599f Merge "Fix broken @see javadoc in android.media.* classes" 2014-11-26 18:48:32 +00:00
Geoff Mendal
fe27981326 am 42acb728: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '42acb728272feccb1d61ccbbf778ee955053d79e':
  Import translations. DO NOT MERGE
 2014-11-26 18:45:36 +00:00
John Spurlock
b20cdd3b6b am 4a0e40a7: am f17f04a5: Merge "Volume: Avoid making bad forceVolumeControlStream call." into lmp-mr1-dev 
* commit '4a0e40a76431cc4ea0c052ea9106616593c1a3de':
  Volume: Avoid making bad forceVolumeControlStream call.
 2014-11-26 18:45:10 +00:00
Geoff Mendal
06e83b3d5a am d075d2f7: (-s ours) am 038c1444: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'd075d2f7594df21c94bae63bce4ed4d797baaef8':
  Import translations. DO NOT MERGE
 2014-11-26 18:45:04 +00:00
Jeff Davidson
228e2c2627 am daa699ce: am 8c99018a: Merge "Handle package changes in NetworkScoreService." into lmp-mr1-dev 
* commit 'daa699ce1dea7882ee7d9f7704a18ca619285a9b':
  Handle package changes in NetworkScoreService.
 2014-11-26 18:44:55 +00:00
Jeff Davidson
480580775e am e5454d57: am f8a3b8e0: Merge "Fix WifiTile\'s Connected indicator for ephemeral networks." into lmp-mr1-dev 
* commit 'e5454d5733a4216a5ad0efb158fe090b19faddf1':
  Fix WifiTile's Connected indicator for ephemeral networks.
 2014-11-26 18:44:46 +00:00
Geoff Mendal
20dd965559 am 9641feee: (-s ours) am 38499cf8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '9641feee025cfd669cd4730bb0609ba16aaffc2a':
  Import translations. DO NOT MERGE
 2014-11-26 18:44:30 +00:00
Geoff Mendal
2bf691436b am cb3a6f89: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'cb3a6f89f1d05f93eaf7b779a28d613d0c123729':
  Import translations. DO NOT MERGE
 2014-11-26 18:44:25 +00:00
Geoff Mendal
ad9889bbd9 am 3efcd8da: (-s ours) am 441d4f04: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '3efcd8da613184e58ea1b23d37c1ad3bd2a141ca':
  Import translations. DO NOT MERGE
 2014-11-26 18:43:57 +00:00
Jorim Jaggi
199d621c5f am f1b05619: am 95e89cae: Fix jank when pin/pattern is shown 
* commit 'f1b05619cc44b039721110955695fa261f1746da':
  Fix jank when pin/pattern is shown
 2014-11-26 18:43:52 +00:00
Jorim Jaggi
f1e6d2315e am c5c2e537: Merge "resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev" into lmp-mr1-ub-dev 
* commit 'c5c2e53779c2c2b6d889bdad5d11d47da9e72789':
  Make IKeyguardService interface asynchronous
 2014-11-26 18:43:47 +00:00
Geoff Mendal
63aa80f6ed am 57086523: (-s ours) Import translations. DO NOT MERGE 
* commit '57086523d593e04db69e5ed75987c669b809176b':
  Import translations. DO NOT MERGE
 2014-11-26 18:43:39 +00:00
Paul Jensen
f19f90b229 am 58a493ac: am be3736d3: Merge "Don\'t let NetworkMonitor state stop user-initiated transitions." into lmp-mr1-dev 
* commit '58a493accfeafa13fd77a16e832c5ad72a4c9006':
  Don't let NetworkMonitor state stop user-initiated transitions.
 2014-11-26 18:43:29 +00:00
Jinsuk Kim
e4d336eb95 am 3052fede: am 1c72ba8a: Merge "CEC: Do not compare active input when updating" into lmp-mr1-dev 
* commit '3052fede8860724a225b49c31ffbb0aa3fd4707b':
  CEC: Do not compare active input when updating
 2014-11-26 18:43:12 +00:00
Andy Hung
e356600772 am feeaa0ba: am f32d06d8: Merge "Allow set loop and position before write for static AudioTracks" into lmp-mr1-dev 
* commit 'feeaa0ba547188453b668a2b1ef80fd6c7dd3a9a':
  Allow set loop and position before write for static AudioTracks
 2014-11-26 18:42:44 +00:00
Dianne Hackborn
5f84109cae am b3cf1136: am 4298db73: Merge "Re-tune low memory killer params." into lmp-mr1-dev 
* commit 'b3cf1136d0d03e82517bf887eef91ce26a7c23bb':
  Re-tune low memory killer params.
 2014-11-26 18:42:02 +00:00
smain@google.com
804830f83c am 357efcd1: am ee032263: am 9da0881f: am 59f4624a: am be718f7c: Merge "add wear design guide for contextual apps" into lmp-docs 
* commit '357efcd1d9b23036bd4e858155696ed2ed27f5dc':
  add wear design guide for contextual apps
 2014-11-26 18:41:53 +00:00
Alan Viverette
7c28a9682b am c8361ba7: am 0a310c99: Merge "Revert "Animates AbsSeekBar progress movement from key presses."" into lmp-mr1-dev 
* commit 'c8361ba78eac66c49d92ff4be36ef23889846ea9':
  Revert "Animates AbsSeekBar progress movement from key presses."
 2014-11-26 18:41:41 +00:00