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

173021 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Adam Lesinski
cbaa1c617b am 6ba4c9d9: am c78b33d0: Merge "split-select: fix OSX build" into lmp-mr1-dev automerge: be593a7 
* commit '6ba4c9d91bfcd2acf3ad85db0a7945438ab4548c':
  split-select: fix OSX build
 2014-11-11 03:01:46 +00:00
Adam Lesinski
6ba4c9d91b am c78b33d0: Merge "split-select: fix OSX build" into lmp-mr1-dev automerge: be593a7 
* commit 'c78b33d01187336d960457980acb05cac86241be':
  split-select: fix OSX build
 2014-11-11 02:55:12 +00:00
Eric Laurent
744300b738 am 8108bf6a: am 4b7b5570: am 75c306dd: am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant automerge: 8db769d automerge: 9e0ed1c automerge: ad64557 automerge: b45d3b2 
* commit '8108bf6a974b929ee42170f5eadd0e3a2751c3c2':
 2014-11-11 02:50:22 +00:00
Adam Lesinski
c78b33d011 Merge "split-select: fix OSX build" into lmp-mr1-dev 
automerge: be593a7

* commit 'be593a7778fe053f67fa37dcc2174639ed725b17':
  split-select: fix OSX build
 2014-11-11 02:48:01 +00: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
c4b46d470f am 71889039: am ce23ecff: Merge "Frameworks/base: Wall Werror in native/graphics" 
* commit '7188903963c6dd497fb44d1c7eb87c075473de9f':
  Frameworks/base: Wall Werror in native/graphics
 2014-11-11 02:43:56 +00:00
Andreas Gampe
469a1a538b am 37fcecde: am 827909fc: Merge "Frameworks/base: Wall Werror in drm" 
* commit '37fcecde6d0053eac3eda237af404819700d6a1d':
  Frameworks/base: Wall Werror in drm
 2014-11-11 02:43:52 +00:00
Andreas Gampe
aab0966421 am 6a7ceb57: am e7368705: Merge "Frameworks/base: Wall Werror in native/android" 
* commit '6a7ceb57c0a99d9ae2c1f7e68b4497b3c0dc2355':
  Frameworks/base: Wall Werror in native/android
 2014-11-11 02:43:47 +00:00
Eric Laurent
8108bf6a97 am 4b7b5570: am 75c306dd: am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant automerge: 8db769d automerge: 9e0ed1c automerge: ad64557 
automerge: b45d3b2

* commit 'b45d3b2bd04d96829c3d28704f6ba1012dc4634f':
 2014-11-11 02:42:43 +00:00
Andreas Gampe
6957369d13 Merge "Frameworks/base: Wall Werror in media/jni" 2014-11-11 02:30:00 +00:00
Adam Lesinski
be593a7778 Merge "split-select: fix OSX build" into lmp-mr1-dev 2014-11-11 02:29:58 +00:00
Yabin Cui
77381ac1d1 am da98fbc3: am 1521303f: Merge "kill OS_CASE_SENSITIVE" 
* commit 'da98fbc33a7bd11710207aaa3aa34351ec9f0747':
  kill OS_CASE_SENSITIVE
 2014-11-11 02:25:29 +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
7188903963 am ce23ecff: Merge "Frameworks/base: Wall Werror in native/graphics" 
* commit 'ce23ecffea9ec4ebe97d91a59e1997aaa77562c9':
  Frameworks/base: Wall Werror in native/graphics
 2014-11-11 02:16:13 +00:00
Andreas Gampe
37fcecde6d am 827909fc: Merge "Frameworks/base: Wall Werror in drm" 
* commit '827909fca34fc144a058ca91cd909bd4265774d0':
  Frameworks/base: Wall Werror in drm
 2014-11-11 02:16:07 +00:00
Andreas Gampe
6a7ceb57c0 am e7368705: Merge "Frameworks/base: Wall Werror in native/android" 
* commit 'e73687053448f0b3c300e9366a852155cd75458d':
  Frameworks/base: Wall Werror in native/android
 2014-11-11 02:16:00 +00:00
Eric Laurent
b45d3b2bd0 am 4b7b5570: am 75c306dd: am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant automerge: 8db769d automerge: 9e0ed1c automerge: ad64557 
* commit '4b7b55705561be791cdc8258f2ebcdd0b8ed1427':
 2014-11-11 02:14:56 +00:00
Eric Laurent
4b7b557055 am 75c306dd: am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant automerge: 8db769d automerge: 9e0ed1c 
automerge: ad64557

* commit 'ad6455721e1257054f2ca4334d2578129429e3b6':
 2014-11-11 02:10:37 +00:00
Yabin Cui
da98fbc33a am 1521303f: Merge "kill OS_CASE_SENSITIVE" 
* commit '1521303f0e4264c1d4ede0250620ad236d485ae0':
  kill OS_CASE_SENSITIVE
 2014-11-11 02:10:12 +00:00
Andreas Gampe
538b00f6e5 Merge "Frameworks/base: Wall Werror in media/mca" 2014-11-11 02:07:27 +00:00
Andreas Gampe
ce23ecffea Merge "Frameworks/base: Wall Werror in native/graphics" 2014-11-11 01:56:11 +00:00
Andreas Gampe
827909fca3 Merge "Frameworks/base: Wall Werror in drm" 2014-11-11 01:53:36 +00:00
Andreas Gampe
e736870534 Merge "Frameworks/base: Wall Werror in native/android" 2014-11-11 01:51:29 +00: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
Eric Laurent
ad6455721e am 75c306dd: am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant automerge: 8db769d automerge: 9e0ed1c 
* commit '75c306ddc716b36bdc54aaf75dd7eacbd008ab98':
 2014-11-11 01:43:21 +00:00
Adam Lesinski
c3344e8a6d split-select: fix OSX build 
Clang is a bit stricter about what template definition it chooses
for mixed types that are normally possible to cast between.
Operations like std::find(int iterator, int iterator, enum) will fail,
as Clang won't implicitly cast an enum to an int here.

Change-Id: Ib2276c382ebf2b877e1045d32b1a9d0a1fa4d4a4
 2014-11-10 17:39:47 -08:00
Eric Laurent
75c306ddc7 am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant automerge: 8db769d 
automerge: 9e0ed1c

* commit '9e0ed1c2d67bc2ec74e24782f3738889fa0d79d2':
 2014-11-11 01:34:45 +00:00
Andreas Gampe
318365e869 Frameworks/base: Wall Werror in drm 
Turn on -Wall -Werror in drm/jni. Fix warnings.

Change-Id: If24fec45fbb737af593ddadfa473548dfa583e0b
 2014-11-10 17:23:02 -08:00
Andreas Gampe
cad87d78da Frameworks/base: Wall Werror in native/graphics 
Turn on -Wall -Werror in native/graphics. Mask skia warnings.

Change-Id: Ia671e91348296ace84d9a24b3c6c025fa889bead
 2014-11-10 17:14:31 -08:00
Yabin Cui
1521303f0e Merge "kill OS_CASE_SENSITIVE" 2014-11-11 01:09:31 +00:00
Dianne Hackborn
35ed2f4c39 am 95ef0ac7: am 525da301: am 85d558cd: Add Activity API to get referrer information. 
* commit '95ef0ac77738eac98e4952fe1e94db64c1560f5e':
  Add Activity API to get referrer information.
 2014-11-11 01:03:02 +00:00
Dianne Hackborn
95ef0ac777 am 525da301: am 85d558cd: Add Activity API to get referrer information. 
* commit '525da301930e554dc331828adee35613f945c250':
  Add Activity API to get referrer information.
 2014-11-11 00:55:10 +00:00
Andreas Gampe
d2361f2f1f Frameworks/base: Wall Werror in native/android 
Turn on -Wall -Werror in native/android.

Change-Id: I28bab9ebd2fe3f6935878816773a04531e26450f
 2014-11-10 16:48:58 -08:00
Dianne Hackborn
525da30193 am 85d558cd: Add Activity API to get referrer information. 
* commit '85d558cd486d195aabfc4b43cff8f338126f60a5':
  Add Activity API to get referrer information.
 2014-11-11 00:47:53 +00:00
Dianne Hackborn
85d558cd48 Add Activity API to get referrer information. 
This expands the use of EXTRA_REFERRER to be relevant anywhere,
allowing apps to supply referrer information if they want.  However,
if they don't explicitly supply it, then the platform now keeps
track of package names that go with Intents when delivering them
to apps, which it can be returned as the default value.

The new method Activity.getReferrer() is used to retrieve this
referrer information.  It knows about EXTRA_REFERRER, it can return
the default package name tracked internally, and it also can return
a new EXTRA_REFERRER_NAME if that exists.  The latter is needed
because we can't use EXTRA_REFERRER in some cases since it is a Uri,
and things like #Intent; URI extras can only generate primitive type
extras.  We really need to support this syntax for referrers, so we
need to have this additional extra field as an option.

When a referrer is to a native app, we are adopting the android-app
scheme.  Since we are doing this, Intent's URI creation and parsing
now supports this scheme, and we improve its syntax to be able to build
intents with custom actions and stuff, instead of being all hung up
on custom schemes.

While doing this, fixed a problem when parsing both intent: and new
android-app: schemes with a selector portion, where we were not
respecting any scheme that was specified.

Change-Id: I06e55221e21a8156c1d6ac755a254fea386917a2
 2014-11-11 00:42:18 +00:00
Alan Viverette
bd401c82b1 am 8c95fb8c: am e1362d11: am 993e3d2d: Merge "Call OnTimeChangedListener when new TimePicker values are selected" into lmp-mr1-dev 
* commit '8c95fb8cba3f1ae21161d386b0b74275d3c158d1':
  Call OnTimeChangedListener when new TimePicker values are selected
 2014-11-11 00:38:42 +00:00
Eric Laurent
38d6cf588f am 99aced3e: am b782ccd8: am 85a5f23b: am ca7c01cb: am 3011e1be: am 8db769dd: am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant 
* commit '99aced3e89f9cf642cbfe55ae168d9cc629786a8':
  AudioEffect JNI: use new max preprocessing constant
 2014-11-11 00:38:38 +00:00
George Mount
2a0ac27b4f am a0bac643: am 2fe4961d: am 19c1cbda: Merge "Only modify add Transition targets when they aren\'t targeted." into lmp-mr1-dev 
* commit 'a0bac6434cf218bf216e30879f3f93740ecc4819':
  Only modify add Transition targets when they aren't targeted.
 2014-11-11 00:38:34 +00:00
Alan Viverette
8c95fb8cba am e1362d11: am 993e3d2d: Merge "Call OnTimeChangedListener when new TimePicker values are selected" into lmp-mr1-dev 
* commit 'e1362d1170471fe3d9946c4812509d7742b0724b':
  Call OnTimeChangedListener when new TimePicker values are selected
 2014-11-11 00:30:03 +00:00
Eric Laurent
99aced3e89 am b782ccd8: am 85a5f23b: am ca7c01cb: am 3011e1be: am 8db769dd: am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant 
* commit 'b782ccd8327a76c68b4cc61709091e3c54aa9fbf':
  AudioEffect JNI: use new max preprocessing constant
 2014-11-11 00:29:57 +00:00
George Mount
a0bac6434c am 2fe4961d: am 19c1cbda: Merge "Only modify add Transition targets when they aren\'t targeted." into lmp-mr1-dev 
* commit '2fe4961d0ddd490d5a82054537697c43cbfd5809':
  Only modify add Transition targets when they aren't targeted.
 2014-11-11 00:29:50 +00:00
Yabin Cui
1e488bfb1e am e7a89f5f: am a3131862: Merge "kill HAVE_INOTIFY" 
* commit 'e7a89f5fa76c58c595d9d9660d7111125e9a492d':
  kill HAVE_INOTIFY
 2014-11-11 00:24:40 +00:00
Eric Laurent
9e0ed1c2d6 am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constant 
automerge: 8db769d

* commit '8db769dd56822a59f1997a9cb53ed02d3d1cb8dd':
  AudioEffect JNI: use new max preprocessing constant
 2014-11-11 00:22:33 +00:00
Yabin Cui
e7a89f5fa7 am a3131862: Merge "kill HAVE_INOTIFY" 
* commit 'a31318620bce4e00e80188ee2778b7799cbdf0dc':
  kill HAVE_INOTIFY
 2014-11-11 00:19:20 +00:00
Joe Fernandez
63ae9a589a am 89f48e69: am 465e0532: am 2b0b7a6c: am 3bd60359: am c2f2a725: Merge "docs:builds tools 21.1.1 update" into lmp-docs automerge: cab3443 
* commit '89f48e69d2e70896afb604a4318324d21d4a2412':
  docs:builds tools 21.1.1 update
 2014-11-11 00:16:05 +00:00
Jorim Jaggi
f5051fefb6 am c2aa0e13: am 12174a7d: Merge "Cancel lockscreen/shade gestures when orientation changes" into lmp-mr1-dev automerge: 8334c66 
* commit 'c2aa0e137165f305525366f0a24860a2388722ba':
  Cancel lockscreen/shade gestures when orientation changes
 2014-11-11 00:10:43 +00:00
Adrian Roos
ba070ec037 am 15f7b37b: am f2bd3cc9: Merge "Add LockSettingsStorage tests" into lmp-mr1-dev automerge: 09fc10f 
* commit '15f7b37b3c9e197a99d1f5833a751e38900e403a':
  Add LockSettingsStorage tests
 2014-11-11 00:10:38 +00:00