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

120526 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Kralevich
0e5aeca7ba am 18c2736c: am a5a0de9f: am b6634304: Merge "Remove setEnforcingMode from SELinuxPolicyInstallReceiver." 
* commit '18c2736cf0afc41e8ee602b7016e668ac267151e':
  Remove setEnforcingMode from SELinuxPolicyInstallReceiver.
 2013-12-02 23:31:50 +00:00
Geoff Mendal
97104b170f am 6415d688: (-s ours) am 09ecd7e2: (-s ours) am d229620e: (-s ours) am 8d49b29d: (-s ours) Import translations. DO NOT MERGE 
* commit '6415d688e049e009e2c4e4dce488ab7f145304b3':
  Import translations. DO NOT MERGE
 2013-12-02 23:31:35 +00:00
Geoff Mendal
2973d25edf am 7f150f86: (-s ours) am 4f43824b: (-s ours) am 33c93907: (-s ours) am 99dcfed6: (-s ours) Import translations. DO NOT MERGE 
* commit '7f150f8676f2564df274380320bc5ea3c2e138de':
  Import translations. DO NOT MERGE
 2013-12-02 23:08:02 +00:00
Xavier Ducrohet
9f38adc4da am 1d3205f6: (-s ours) am b6f3708d: am 1044a1dc: Merge "Update delegate methods in layoutlib." into klp-dev 
* commit '1d3205f62a75b92cda1b10f3151234741e4e708b':
  Update delegate methods in layoutlib.
 2013-12-02 23:07:59 +00:00
Jason Sams
5a2ed23cbf Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2013-12-02 23:07:58 +00:00
Alan Viverette
8af04d8b85 Merge "Fix LongArray.addAll() to use correct arraycopy argument order" 2013-12-02 21:20:07 +00:00
Lorenzo Colitti
317d15c155 am 4806fdfb: am f226bc60: Merge "Use LinkAddress in address notifications." 
* commit '4806fdfbd0fecf91584396fc0f620c97a05ab837':
  Use LinkAddress in address notifications.
 2013-12-02 20:53:06 +00:00
Katie McCormick
d786a1900e resolved conflicts for merge of 37e4c405 to master 
Change-Id: I7df89be84384369ef5e89bb3b924ca38c1b5d9bd
 2013-12-02 12:37:58 -08:00
Nick Kralevich
18c2736cf0 am a5a0de9f: am b6634304: Merge "Remove setEnforcingMode from SELinuxPolicyInstallReceiver." 
* commit 'a5a0de9f2943c6188bd5855adfe4c5da7a985d2d':
  Remove setEnforcingMode from SELinuxPolicyInstallReceiver.
 2013-12-02 20:12:55 +00:00
Nick Kralevich
a5a0de9f29 am b6634304: Merge "Remove setEnforcingMode from SELinuxPolicyInstallReceiver." 
* commit 'b66343049bc56d29988a91d2d29d49861a469b84':
  Remove setEnforcingMode from SELinuxPolicyInstallReceiver.
 2013-12-02 12:08:42 -08:00
Nick Kralevich
b66343049b Merge "Remove setEnforcingMode from SELinuxPolicyInstallReceiver." 2013-12-02 20:00:28 +00:00
Stephen Smalley
856df42a5a Remove setEnforcingMode from SELinuxPolicyInstallReceiver. 
It never worked anyhow, at least in AOSP, as nothing checks that property,
and is pointless now that enforcing mode is set by init.

Change-Id: If05dd49963c5d7081e00039b5e378032bea0939b
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2013-12-02 14:38:31 -05:00
Glenn Kasten
866dbc9a73 Merge "Fix typo nbChannels -> channelMask" 2013-12-02 19:13:43 +00:00
Geoff Mendal
99e50023ab Merge "Import translations. DO NOT MERGE" 2013-12-02 19:13:26 +00:00
Geoff Mendal
6415d688e0 am 09ecd7e2: (-s ours) am d229620e: (-s ours) am 8d49b29d: (-s ours) Import translations. DO NOT MERGE 
* commit '09ecd7e2dc9b5fba8aeae9c31bd7638732a10cfc':
  Import translations. DO NOT MERGE
 2013-12-02 18:50:36 +00:00
Geoff Mendal
83f3eca54b Import translations. DO NOT MERGE 
Change-Id: I87073de420071cb38050754b98f3c3e9db485f45
Auto-generated-cl: translation import
 2013-12-02 10:46:41 -08:00
Geoff Mendal
09ecd7e2dc am d229620e: (-s ours) am 8d49b29d: (-s ours) Import translations. DO NOT MERGE 
* commit 'd229620e8e9843227ade580e4e1b8913e7e18b24':
  Import translations. DO NOT MERGE
 2013-12-02 10:46:40 -08:00
Geoff Mendal
d229620e8e am 8d49b29d: (-s ours) Import translations. DO NOT MERGE 
* commit '8d49b29d81be4d7ad694fa222c48c469bd112ca3':
  Import translations. DO NOT MERGE
 2013-12-02 10:44:05 -08:00
Geoff Mendal
8d49b29d81 Import translations. DO NOT MERGE 
Change-Id: Ifb196b0f76843e5488d4a387ed4f7add07e84ecd
Auto-generated-cl: translation import
 2013-12-02 10:21:45 -08:00
Geoff Mendal
dca4e9ab8d Import translations. DO NOT MERGE 
Change-Id: I60f3f34d647bb11d8239a012b04cf8b6002467a0
Auto-generated-cl: translation import
 2013-12-02 10:15:07 -08:00
Alan Viverette
db24d142f5 Fix LongArray.addAll() to use correct arraycopy argument order 
BUG: 11709513
Change-Id: I831e74ccb008739ab315c68618c04f870f9a36a5
 2013-11-27 17:38:24 -08:00
Jason Sams
afb02269cf Merge commit '1ccc6633' into manualmerge 
Conflicts:
	graphics/java/android/renderscript/Double2.java
	graphics/java/android/renderscript/Double3.java
	graphics/java/android/renderscript/Double4.java
	graphics/java/android/renderscript/Float2.java
	graphics/java/android/renderscript/Float3.java
	graphics/java/android/renderscript/Float4.java
	graphics/java/android/renderscript/Int2.java
	graphics/java/android/renderscript/Int3.java
	graphics/java/android/renderscript/Int4.java
	graphics/java/android/renderscript/Long2.java
	graphics/java/android/renderscript/Long3.java
	graphics/java/android/renderscript/Long4.java
	graphics/java/android/renderscript/Short2.java
	graphics/java/android/renderscript/Short3.java
	graphics/java/android/renderscript/Short4.java

Change-Id: Ib9e940bc7d62764020eea7639d7158af707eb33f
 2013-11-27 15:30:06 -08:00
Geoff Mendal
4f0be08f2b Merge "Import translations. DO NOT MERGE" 2013-11-27 20:16:38 +00:00
Katie McCormick
3a5b037422 am ad0cab26: am fdb738a5: am 752d8029: Merge "Doc update: minor changes to immersive lesson" into klp-docs 
* commit 'ad0cab26a7abb0b6d08e5a807bf8aff87db0a52a':
  Doc update: minor changes to immersive lesson
 2013-11-27 10:47:50 -08:00
Geoff Mendal
5229164040 Import translations. DO NOT MERGE 
Change-Id: Id51ce9cb79528df7df7d0473544792473514f454
Auto-generated-cl: translation import
 2013-11-27 10:45:55 -08:00
Geoff Mendal
7f150f8676 am 4f43824b: (-s ours) am 33c93907: (-s ours) am 99dcfed6: (-s ours) Import translations. DO NOT MERGE 
* commit '4f43824b04223d3958efa757014b4c29044aae55':
  Import translations. DO NOT MERGE
 2013-11-27 18:35:12 +00:00
Geoff Mendal
4f43824b04 am 33c93907: (-s ours) am 99dcfed6: (-s ours) Import translations. DO NOT MERGE 
* commit '33c939079600ae5f7cfcd179333361819547ea49':
  Import translations. DO NOT MERGE
 2013-11-27 10:32:26 -08:00
Geoff Mendal
33c9390796 am 99dcfed6: (-s ours) Import translations. DO NOT MERGE 
* commit '99dcfed6e90a3639d7d9b8cc2c1654b7cc20d573':
  Import translations. DO NOT MERGE
 2013-11-27 10:29:07 -08:00
Geoff Mendal
99dcfed6e9 Import translations. DO NOT MERGE 
Change-Id: Icd558c400a77f1e2b72e7279e33c56aa96398a1e
Auto-generated-cl: translation import
 2013-11-27 10:20:55 -08:00
Geoff Mendal
88f03b330c Import translations. DO NOT MERGE 
Change-Id: Ia382ccfd20516ba157a6d9a0f4216c2af102190c
Auto-generated-cl: translation import
 2013-11-27 10:17:54 -08:00
Xavier Ducrohet
1d3205f62a am b6f3708d: am 1044a1dc: Merge "Update delegate methods in layoutlib." into klp-dev 
* commit 'b6f3708d330872232a6a57a1a5c0d2243fd7419e':
  Update delegate methods in layoutlib.
 2013-11-26 17:58:26 -08:00
Lorenzo Colitti
4806fdfbd0 am f226bc60: Merge "Use LinkAddress in address notifications." 
* commit 'f226bc606af9ce5aceff6b05fc4b0200c94cb248':
  Use LinkAddress in address notifications.
 2013-11-26 17:56:45 -08:00
Xavier Ducrohet
b6f3708d33 am 1044a1dc: Merge "Update delegate methods in layoutlib." into klp-dev 
* commit '1044a1dc197a9508ef8c6b352e7983ff234b8bc4':
  Update delegate methods in layoutlib.
 2013-11-26 17:54:10 -08:00
Xavier Ducrohet
1044a1dc19 Merge "Update delegate methods in layoutlib." into klp-dev 2013-11-27 01:32:26 +00:00
Lorenzo Colitti
f226bc606a Merge "Use LinkAddress in address notifications." 2013-11-27 00:52:42 +00:00
Ying Wang
1622981ca4 Fix sdk build. 
Change-Id: I11471213826b212b99c0ddba89a7f4cef110fcc4
 2013-11-26 15:47:43 -08:00
Alan Viverette
26606007be Merge "Fix header and footer dividers to match docs" 2013-11-26 22:40:42 +00:00
Katie McCormick
37e4c405a6 am 484b57a5: am 9d0a88bd: Merge "Doc updates: Javadoc fixes" into klp-docs 
* commit '484b57a5655f28967e0062f578f38535dff52323':
  Doc updates: Javadoc fixes
 2013-11-26 14:00:33 -08:00
Katie McCormick
484b57a565 am 9d0a88bd: Merge "Doc updates: Javadoc fixes" into klp-docs 
* commit '9d0a88bd4e07deac01d7759b70cdf160456be1c0':
  Doc updates: Javadoc fixes
 2013-11-26 21:58:18 +00:00
Katie McCormick
9d0a88bd4e Merge "Doc updates: Javadoc fixes" into klp-docs 2013-11-26 21:56:09 +00:00
Katie McCormick
f2ef28d840 Doc updates: Javadoc fixes 
Change-Id: I82381056f9f13e53ab8a0525f5a53bf98674c052
 2013-11-26 13:52:48 -08:00
Jason Sams
1ccc6633bf am 9e6d8f04: Merge "Adding operations to reflected Renderscript class" 
* commit '9e6d8f04940fd710ae858ff7ee4df43eb03ea85e':
  Adding operations to reflected Renderscript class
 2013-11-26 12:32:22 -08:00
Jason Sams
3042d2692f Generic object based data copy. 
This change consolidates the copy paths to Object based.
The runtime now uses reflection to identify the type of
array present.  This adds support for long/double and reduces
the amount of code present.  We could also support arrays of vectors
or objects in the future with this mechanism.


Change-Id: I2297c1c01fbe6a64c375d6368f25d7db781ea788
 2013-11-26 12:29:46 -08:00
Jason Sams
9e6d8f0494 Merge "Adding operations to reflected Renderscript class" 2013-11-26 20:23:44 +00:00
Katie McCormick
ad0cab26a7 am fdb738a5: am 752d8029: Merge "Doc update: minor changes to immersive lesson" into klp-docs 
* commit 'fdb738a52fe0f0f3bef8b867c6646668d86835dd':
  Doc update: minor changes to immersive lesson
 2013-11-26 11:13:05 -08:00
Katie McCormick
fdb738a52f am 752d8029: Merge "Doc update: minor changes to immersive lesson" into klp-docs 
* commit '752d8029176d3670b9e817d8465d854d4a1b933e':
  Doc update: minor changes to immersive lesson
 2013-11-26 19:09:52 +00:00
Katie McCormick
752d802917 Merge "Doc update: minor changes to immersive lesson" into klp-docs 2013-11-26 19:06:07 +00:00
Dan Sandler
baaabd5381 am 8e77393a: am 99ef026f: Merge "Keep PhoneStatusBar default constructor around." 
* commit '8e77393ae9b5ff99be06798311b3ec4362fbcb40':
  Keep PhoneStatusBar default constructor around.
 2013-11-26 08:48:37 -08:00
Lorenzo Colitti
5a7b1503b5 am c1c23780: am 9d4ac970: Merge "Pass DNS server info notifications to observers." 
* commit 'c1c23780339c35ab2d88c905d91e290050b35435':
  Pass DNS server info notifications to observers.
 2013-11-26 08:48:34 -08:00
Lorenzo Colitti
ab20cfd916 am 6747ea1b: am eede7e89: Merge "Minor cleanups to NetdCallbackReceiver.onEvent." 
* commit '6747ea1b1cdf796710c01317da204f50d5721755':
  Minor cleanups to NetdCallbackReceiver.onEvent.
 2013-11-26 08:48:30 -08:00