Leon Scroggins III
82b7b0b2af
Remove call to deprecated function.
...
setPrefConfigTable(array) is being removed in
https://codereview.chromium.org/99473004
Change-Id: I2d7e25052861f7f1d54e2418c11204d51bb88b1e
2013-12-02 17:17:21 -05:00
Scott Main
2dd715ed45
Merge "fix FPS typo in JB highlights, reported by vharron" into klp-docs
2013-12-02 22:16:24 +00:00
Dirk Dougherty
ac5894d4b2
am ba6854d6: am b5d5a787: am 19d3ac5e: Merge "Doc change: update gcore docs to fix javadoc ref error and expose Samples tab." into klp-docs
...
* commit 'ba6854d6f6e564d3cfad70ad0674924a1aca6cc9':
Doc change: update gcore docs to fix javadoc ref error and expose Samples tab.
2013-12-02 21:57:50 +00:00
Dirk Dougherty
ba6854d6f6
am b5d5a787: am 19d3ac5e: Merge "Doc change: update gcore docs to fix javadoc ref error and expose Samples tab." into klp-docs
...
* commit 'b5d5a787e31bcba8822545c56d6506a38229bf22':
Doc change: update gcore docs to fix javadoc ref error and expose Samples tab.
2013-12-02 13:53:52 -08:00
Dirk Dougherty
b5d5a787e3
am 19d3ac5e: Merge "Doc change: update gcore docs to fix javadoc ref error and expose Samples tab." into klp-docs
...
* commit '19d3ac5eb67bcb99f249642d41bcea89d7146104':
Doc change: update gcore docs to fix javadoc ref error and expose Samples tab.
2013-12-02 21:49:31 +00:00
Dirk Dougherty
19d3ac5eb6
Merge "Doc change: update gcore docs to fix javadoc ref error and expose Samples tab." into klp-docs
2013-12-02 21:47:04 +00:00
Dirk Dougherty
d189845323
Doc change: update gcore docs to fix javadoc ref error and expose Samples tab.
...
Change-Id: I93133f3424127a0e2da256eceee3eebc8c8add18
2013-12-02 13:40:27 -08:00
Alan Viverette
8af04d8b85
Merge "Fix LongArray.addAll() to use correct arraycopy argument order"
2013-12-02 21:20:07 +00:00
Scott Main
351001f904
fix FPS typo in JB highlights, reported by vharron
...
Change-Id: I6a98af7730d1e56f08b5ba9a9f7d462cc35e17e8
2013-12-02 12:55:33 -08: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
Scott Main
8be9d428a1
am b7cdfa02: am b243bbb4: am 65907fd4: dashboard update for 12/2/13 first appearance of kitkat
...
* commit 'b7cdfa0238436d2ead785587bd50ec560bcae5bb':
dashboard update for 12/2/13 first appearance of kitkat
2013-12-02 20:28:56 +00:00
Scott Main
b7cdfa0238
am b243bbb4: am 65907fd4: dashboard update for 12/2/13 first appearance of kitkat
...
* commit 'b243bbb4c89e67bdbf11df47dd79645c398b877b':
dashboard update for 12/2/13 first appearance of kitkat
2013-12-02 12:25:07 -08:00
Scott Main
b243bbb4c8
am 65907fd4: dashboard update for 12/2/13 first appearance of kitkat
...
* commit '65907fd4af6a1074a7b052751746fd99095627c6':
dashboard update for 12/2/13 first appearance of kitkat
2013-12-02 20:21:33 +00: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
Scott Main
65907fd4af
dashboard update for 12/2/13
...
first appearance of kitkat
Change-Id: I528cb8d938b3a9e0da4c44db2b615ad90c211436
2013-12-02 12:11:22 -08: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
Glenn Kasten
a16a979315
Update comments for AudioRecord IllegalArgumentException
...
Also explicitly list IllegalArgumentException in throws clause of the
constructor helper methods, as that is a critical side-effect of these methods.
Change-Id: I5cae5dfd807235fbdd827ef4ebc7cf05bfd11c02
2013-12-02 11:50:46 -08:00
Glenn Kasten
19294ca0e8
Document need to call AudioRecord.getState() after construction
...
Change-Id: Ia6ebb5b01ae60453b6fc7db79e2ec3d40d2b56f1
2013-12-02 11:50:45 -08:00
Glenn Kasten
a9838afbe3
Include more information in AudioRecord error logs
...
Change-Id: I15ec85760d3523120925608ebe3560f901cdffd7
2013-12-02 11:50:37 -08: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
Shishir Agrawal
8b03ab8502
RIL changes for supporting generic SIM communication.
...
Adds the 4 new commands to RIL interface:
- RIL_REQUEST_SIM_TRANSMIT_BASIC (AT+CSIM - TS 27.007)
- RIL_REQUEST_SIM_OPEN_CHANNEL (AT+CCHO - TS 27.007)
- RIL_REQUEST_SIM_CLOSE_CHANNEL (AT+CCHC - TS 27.007)
- RIL_REQUEST_SIM_TRANSMIT_CHANNEL (AT+CGLA - TS 27.007)
Change-Id: Iee4d950d37a6097493cd945e611c914c40827215
2013-12-02 10:56:21 -08: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
Dianne Hackborn
06a06db5c4
Fix issue #11536426 : Permission denied when trying to launch...
...
...an activity from a notification
We don't remove pending intents when updating an app, which is necessary
to keep app widgets and other things working. However, when uninstalling
an app, we should clear out all of its pending intents.
Change-Id: I4b2980f407dbae6c2f4700ca8bc08f299f0a6dca
2013-12-02 10:46:29 -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
Amith Yamasani
bf2c4b7880
DO NOT MERGE: Don't freak out if SystemUiService isn't available
...
Reducing dependencies on system services
Change-Id: I301f1e6c9bbe30b43303c7bf9899387b9029e4ab
2013-12-02 07:29:35 -08:00
Mike Lockwood
a34f0cd99c
DO NOT MERGE: Remove obsolete "headless" support
...
Change-Id: Idd5146087af33117440450de8d8fe1287c068455
2013-12-02 07:29:20 -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