OSDN Git Service
Scott Main [Wed, 24 Jul 2013 23:20:01 +0000 (16:20 -0700)]
am
f2134151: api overview edits
* commit '
f213415175ec83df7b39089d559eb9d02b72883a':
api overview edits
Scott Main [Wed, 24 Jul 2013 23:19:57 +0000 (16:19 -0700)]
am
0cf24a5a: am
538ccd69: Merge "update usb driver doc with download link; delete revision notes" into jb-mr2-dev
* commit '
0cf24a5aa5f04ee48f643fd4cb707f3ed64b8e29':
update usb driver doc with download link; delete revision notes
Joe Fernandez [Wed, 24 Jul 2013 23:19:49 +0000 (16:19 -0700)]
am
8b93ba78: am
cd76edb9: Merge "docs: OpenGL ES 3.0 dev guide update" into jb-mr2-dev
* commit '
8b93ba786f0e50ab8cfbfb9a6f723913cc8e6eeb':
docs: OpenGL ES 3.0 dev guide update
Scott Main [Wed, 24 Jul 2013 23:19:42 +0000 (16:19 -0700)]
am
ef43b761: am
2edf372e: fix javadoc error
* commit '
ef43b7617c3b067d5d1f34ed41581f55c28c0659':
fix javadoc error
Scott Main [Wed, 24 Jul 2013 23:19:32 +0000 (16:19 -0700)]
am
a73fb627: am
3dee8aaf: Merge "update action bar guide for support lib ABC" into jb-mr2-dev
* commit '
a73fb627dc87128b7999fac4d8742881737290d6':
update action bar guide for support lib ABC
Scott Main [Wed, 24 Jul 2013 02:18:40 +0000 (19:18 -0700)]
api overview edits
Change-Id: I3bd4941b3d77c7bbe2c678254e336c069070363e
Scott Main [Wed, 24 Jul 2013 01:19:09 +0000 (18:19 -0700)]
am
538ccd69: Merge "update usb driver doc with download link; delete revision notes" into jb-mr2-dev
* commit '
538ccd69e29896ca7611e9fbf7c8734e1fa9f336':
update usb driver doc with download link; delete revision notes
Scott Main [Wed, 24 Jul 2013 01:16:59 +0000 (01:16 +0000)]
Merge "update usb driver doc with download link; delete revision notes" into jb-mr2-dev
Joe Fernandez [Tue, 23 Jul 2013 22:54:05 +0000 (15:54 -0700)]
am
cd76edb9: Merge "docs: OpenGL ES 3.0 dev guide update" into jb-mr2-dev
* commit '
cd76edb92941d99ade31a1a8db239611d62551f5':
docs: OpenGL ES 3.0 dev guide update
Joe Fernandez [Tue, 23 Jul 2013 22:52:14 +0000 (22:52 +0000)]
Merge "docs: OpenGL ES 3.0 dev guide update" into jb-mr2-dev
Joe Fernandez [Tue, 9 Jul 2013 19:20:36 +0000 (12:20 -0700)]
docs: OpenGL ES 3.0 dev guide update
Change-Id: I46b9aee4c6b31e1ac6148f79b8607292b04f69c6
Scott Main [Tue, 23 Jul 2013 20:55:20 +0000 (13:55 -0700)]
am
2edf372e: fix javadoc error
* commit '
2edf372ed2a7f6e640591dbb76b429eecd5e31d0':
fix javadoc error
Scott Main [Tue, 23 Jul 2013 20:52:05 +0000 (13:52 -0700)]
fix javadoc error
Change-Id: Ieae3e73cda9541e774626fbd73100cdadc1513ad
Scott Main [Tue, 23 Jul 2013 20:41:38 +0000 (13:41 -0700)]
update usb driver doc with download link;
delete revision notes
Change-Id: I325137a026ea99cb2cd5d5f4689a9c1ee5942a92
Scott Main [Tue, 23 Jul 2013 20:22:44 +0000 (13:22 -0700)]
am
3dee8aaf: Merge "update action bar guide for support lib ABC" into jb-mr2-dev
* commit '
3dee8aaf17c9e383afe91a30eff1aa7c1f8fed69':
update action bar guide for support lib ABC
Scott Main [Tue, 23 Jul 2013 20:21:12 +0000 (20:21 +0000)]
Merge "update action bar guide for support lib ABC" into jb-mr2-dev
Dirk Dougherty [Tue, 23 Jul 2013 19:45:37 +0000 (12:45 -0700)]
am
9aaa8f30: am
0acf946b: Doc change: Add Colopl video to carousel and spotlight. cherrypick/merge of I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93
* commit '
9aaa8f30393413a5a52c4494146b35de3124d8a0':
Doc change: Add Colopl video to carousel and spotlight. cherrypick/merge of I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93
Dirk Dougherty [Tue, 23 Jul 2013 19:42:19 +0000 (12:42 -0700)]
am
0acf946b: Doc change: Add Colopl video to carousel and spotlight. cherrypick/merge of I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93
* commit '
0acf946bb4968416d123ced337d8bb42eb17df8b':
Doc change: Add Colopl video to carousel and spotlight. cherrypick/merge of I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93
Dirk Dougherty [Thu, 18 Jul 2013 01:00:35 +0000 (18:00 -0700)]
Doc change: Add Colopl video to carousel and spotlight.
cherrypick/merge of I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93
Change-Id: I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93
Scott Main [Wed, 19 Jun 2013 04:16:25 +0000 (21:16 -0700)]
update action bar guide for support lib ABC
Change-Id: Ie4594b3a0e0a686ed37d858788c7c747a1ee09e0
Joe Fernandez [Mon, 22 Jul 2013 21:04:47 +0000 (14:04 -0700)]
am
874b2ba1: am
c4624d2e: Merge "docs: Android 4.3 Platform Release Notes" into jb-mr2-dev
* commit '
874b2ba1f997401ad3dd0a5d192269ac682906a3':
docs: Android 4.3 Platform Release Notes
Joe Fernandez [Mon, 22 Jul 2013 21:01:24 +0000 (14:01 -0700)]
am
c4624d2e: Merge "docs: Android 4.3 Platform Release Notes" into jb-mr2-dev
* commit '
c4624d2efbeab6c9ef89def696421aaa086025bd':
docs: Android 4.3 Platform Release Notes
Joe Fernandez [Mon, 22 Jul 2013 20:57:20 +0000 (20:57 +0000)]
Merge "docs: Android 4.3 Platform Release Notes" into jb-mr2-dev
Joe Fernandez [Fri, 14 Jun 2013 18:53:33 +0000 (11:53 -0700)]
docs: Android 4.3 Platform Release Notes
In addition to platform notes, modified the SDK Manager update
warning to advise downloading of SDK Tools 22 or higher. This
dependency is based on the updating of the SDK repository
schema. The last update was repository-8 with the SDK 22.0.0
release, according to raphael@.
Change-Id: Icaaf39a6d49eccdc926aa4c4249db8a0b1d095a7
Joe Fernandez [Mon, 22 Jul 2013 16:19:18 +0000 (09:19 -0700)]
am
abbcf372: am
60c4b16e: Merge "docs: NDK r9 Release Notes" into jb-mr2-dev
* commit '
abbcf372b8aadd8ac53de5f25d4d82b2d57eaeaf':
docs: NDK r9 Release Notes
Joe Fernandez [Mon, 22 Jul 2013 16:16:07 +0000 (09:16 -0700)]
am
60c4b16e: Merge "docs: NDK r9 Release Notes" into jb-mr2-dev
* commit '
60c4b16e28748d235d3b7c73906522b2c43d84a5':
docs: NDK r9 Release Notes
Joe Fernandez [Mon, 22 Jul 2013 16:13:20 +0000 (16:13 +0000)]
Merge "docs: NDK r9 Release Notes" into jb-mr2-dev
Chet Haase [Mon, 22 Jul 2013 16:02:06 +0000 (09:02 -0700)]
am
dbc51de4: am
53771e5f: Merge "Remove useless/repetitive code"
* commit '
dbc51de44fe4f9a7f81528204250de32ec405d39':
Remove useless/repetitive code
Chet Haase [Mon, 22 Jul 2013 15:59:30 +0000 (08:59 -0700)]
am
53771e5f: Merge "Remove useless/repetitive code"
* commit '
53771e5f955f67035cf6b6432c34171a18ab14dc':
Remove useless/repetitive code
Chet Haase [Mon, 22 Jul 2013 15:55:52 +0000 (15:55 +0000)]
Merge "Remove useless/repetitive code"
Joe Fernandez [Thu, 13 Jun 2013 21:36:37 +0000 (14:36 -0700)]
docs: NDK r9 Release Notes
Change-Id: I43cae1e306a8313ab2d003dbb762977f75bf8208
The Android Open Source Project [Fri, 19 Jul 2013 21:20:43 +0000 (14:20 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I1d7f0e0f6a4cb8b9363c99a830dc1656424ad49d
Joe Fernandez [Fri, 19 Jul 2013 20:38:02 +0000 (13:38 -0700)]
am
379cb6b7: am
ab00d352: am
658374d5: am
2685febd: am
6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev
* commit '
379cb6b7f0f62009caeeda00a05d3185bc06b8aa':
docs: Android SDK 22.0.4 Release Notes
Robert Greenwalt [Fri, 19 Jul 2013 20:37:58 +0000 (13:37 -0700)]
am
ddf17b5b: am
8c87b297: Merge "Make CS.isTetheringSupported dynamic" into jb-mr2-dev
* commit '
ddf17b5b82f25965502377588483abbc328c4e6d':
Make CS.isTetheringSupported dynamic
Scott Main [Fri, 19 Jul 2013 20:37:54 +0000 (13:37 -0700)]
am
a74517d2: am
ca3b4e9b: remove significant motion
* commit '
a74517d25d8258ed14d4cf4aab7cf82d6b51e729':
remove significant motion
Scott Main [Fri, 19 Jul 2013 20:37:50 +0000 (13:37 -0700)]
am
52a74a21: am
1be76349: Merge "more details about account access in restricted profiles" into jb-mr2-dev
* commit '
52a74a2143274b2a3c5906cc882fa48d687b5cf8':
more details about account access in restricted profiles
Scott Main [Fri, 19 Jul 2013 20:37:47 +0000 (13:37 -0700)]
am
1cf7b4a4: am
d3ed45f8: am
991487c6: am
9a1f106d: am
34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev
* commit '
1cf7b4a438a01d2c018699e38332965b366f479c':
fix typo in code sample
Dirk Dougherty [Fri, 19 Jul 2013 20:37:44 +0000 (13:37 -0700)]
am
46cc4dbb: am
e0380d8f: resolved conflics for merge of
54201120 to jb-mr2-dev
* commit '
46cc4dbb38968dadffcc5f78dd69d391768711e1':
Doc change: Add Colopl video to carousel and spotlight.
Robert Greenwalt [Fri, 19 Jul 2013 20:37:41 +0000 (13:37 -0700)]
am
b5bf655c: am
e874bd35: Merge "Add gservices updater for carrier provisioning url" into jb-mr2-dev
* commit '
b5bf655cc6cc9128aec99958cce3b054348c9273':
Add gservices updater for carrier provisioning url
Jean-Michel Trivi [Fri, 19 Jul 2013 20:37:38 +0000 (13:37 -0700)]
am
f65c9189: am
bbc9a62a: Cleaner Tejat notification in Audio Package 11
* commit '
f65c9189843ea55fc3e3c7154331c9f0ad330210':
Cleaner Tejat notification in Audio Package 11
Wink Saville [Fri, 19 Jul 2013 20:37:35 +0000 (13:37 -0700)]
am
df43ba82: am
e3badc10: Merge "When a SIM is changed check mobile provisioning." into jb-mr2-dev
* commit '
df43ba82e6c232985a95c9827f7d71dd3194e0a8':
When a SIM is changed check mobile provisioning.
Deepanshu Gupta [Fri, 19 Jul 2013 20:37:32 +0000 (13:37 -0700)]
am
a2f41b23: am
bf8be2ee: Merge "Add orientation to configuration for layoutlib." into jb-mr2-dev
* commit '
a2f41b23b6328b0ff3bb04d4a88ccf4a84a50375':
Add orientation to configuration for layoutlib.
Roman Nurik [Fri, 19 Jul 2013 20:37:28 +0000 (13:37 -0700)]
am
0f33e44f: am
0987ff87: Merge "Add Flo to device art generator." into jb-mr2-dev
* commit '
0f33e44fbc2e506fce71bf087a0b18b7979daaf9':
Add Flo to device art generator.
Jeff Brown [Fri, 19 Jul 2013 20:37:25 +0000 (13:37 -0700)]
am
2445880c: am
ba8a5413: Fix missing lock in power manager.
* commit '
2445880c5cb6504455bd5cae38a850744f4804be':
Fix missing lock in power manager.
Craig Mautner [Fri, 19 Jul 2013 20:37:22 +0000 (13:37 -0700)]
am
a64325f6: am
7c6be10d: Remove iterators (DO NOT MERGE)
* commit '
a64325f6e70569255ff395a85ec161f3230f9e35':
Remove iterators (DO NOT MERGE)
Joe Fernandez [Fri, 19 Jul 2013 20:34:28 +0000 (13:34 -0700)]
am
ab00d352: am
658374d5: am
2685febd: am
6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev
* commit '
ab00d352ffc8a60cf4811cc79dd1dc69bc8ee407':
docs: Android SDK 22.0.4 Release Notes
Robert Greenwalt [Fri, 19 Jul 2013 20:34:22 +0000 (13:34 -0700)]
am
8c87b297: Merge "Make CS.isTetheringSupported dynamic" into jb-mr2-dev
* commit '
8c87b29793da439b8718227bf2d03405c8ad264a':
Make CS.isTetheringSupported dynamic
Scott Main [Fri, 19 Jul 2013 20:34:04 +0000 (13:34 -0700)]
am
ca3b4e9b: remove significant motion
* commit '
ca3b4e9b7e5498650993dc99d70acacc1fa2d1fb':
remove significant motion
Scott Main [Fri, 19 Jul 2013 20:34:02 +0000 (13:34 -0700)]
am
1be76349: Merge "more details about account access in restricted profiles" into jb-mr2-dev
* commit '
1be763494e9df0d1477dcaa4ba0163cce68f416a':
more details about account access in restricted profiles
Scott Main [Fri, 19 Jul 2013 20:33:58 +0000 (13:33 -0700)]
am
d3ed45f8: am
991487c6: am
9a1f106d: am
34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev
* commit '
d3ed45f841419b90e1d6813d9bcefbcb91554a63':
fix typo in code sample
Dirk Dougherty [Fri, 19 Jul 2013 20:33:46 +0000 (13:33 -0700)]
am
e0380d8f: resolved conflics for merge of
54201120 to jb-mr2-dev
* commit '
e0380d8fe675a1c1785cfd5d2b7f0c6b59c27c54':
Doc change: Add Colopl video to carousel and spotlight.
Robert Greenwalt [Fri, 19 Jul 2013 20:33:35 +0000 (13:33 -0700)]
am
e874bd35: Merge "Add gservices updater for carrier provisioning url" into jb-mr2-dev
* commit '
e874bd351f7b68cead889f55afba505fb5fac97c':
Add gservices updater for carrier provisioning url
Jean-Michel Trivi [Fri, 19 Jul 2013 20:33:30 +0000 (13:33 -0700)]
am
bbc9a62a: Cleaner Tejat notification in Audio Package 11
* commit '
bbc9a62a71dd35c30eed96db9d4e23a754b55d8d':
Cleaner Tejat notification in Audio Package 11
Wink Saville [Fri, 19 Jul 2013 20:33:19 +0000 (13:33 -0700)]
am
e3badc10: Merge "When a SIM is changed check mobile provisioning." into jb-mr2-dev
* commit '
e3badc10112b76db583736767849b2f82ae737fd':
When a SIM is changed check mobile provisioning.
Deepanshu Gupta [Fri, 19 Jul 2013 20:33:17 +0000 (13:33 -0700)]
am
bf8be2ee: Merge "Add orientation to configuration for layoutlib." into jb-mr2-dev
* commit '
bf8be2eefb1f5172582f688cbc090ec04d6908f1':
Add orientation to configuration for layoutlib.
Roman Nurik [Fri, 19 Jul 2013 20:33:05 +0000 (13:33 -0700)]
am
0987ff87: Merge "Add Flo to device art generator." into jb-mr2-dev
* commit '
0987ff8768512c3d519a5d5bbe5c4eb6b54548dc':
Add Flo to device art generator.
Jeff Brown [Fri, 19 Jul 2013 20:32:48 +0000 (13:32 -0700)]
am
ba8a5413: Fix missing lock in power manager.
* commit '
ba8a54136d184d48fbed4f7b27734f645e4e8ad0':
Fix missing lock in power manager.
Craig Mautner [Fri, 19 Jul 2013 20:32:40 +0000 (13:32 -0700)]
am
7c6be10d: Remove iterators (DO NOT MERGE)
* commit '
7c6be10d314413bb7afbed41017343320319915d':
Remove iterators (DO NOT MERGE)
Joe Fernandez [Fri, 19 Jul 2013 20:05:12 +0000 (13:05 -0700)]
am
658374d5: am
2685febd: am
6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev
* commit '
658374d56577a4f8864ba3c7ed8f2e425d13d997':
docs: Android SDK 22.0.4 Release Notes
Joe Fernandez [Fri, 19 Jul 2013 20:02:24 +0000 (13:02 -0700)]
am
2685febd: am
6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev
* commit '
2685febd0d51bac4da755756b5348eb95c57ef73':
docs: Android SDK 22.0.4 Release Notes
Joe Fernandez [Fri, 19 Jul 2013 19:59:11 +0000 (12:59 -0700)]
am
6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev
* commit '
6f75a73c04ebd5f0ae10e6e89618f492d842ed96':
docs: Android SDK 22.0.4 Release Notes
Joe Fernandez [Fri, 19 Jul 2013 19:55:47 +0000 (19:55 +0000)]
Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev
Joe Fernandez [Mon, 15 Jul 2013 19:35:05 +0000 (12:35 -0700)]
docs: Android SDK 22.0.4 Release Notes
Change-Id: Ia140f81dce8352860149cf709e1ed0be46c052a0
Robert Greenwalt [Fri, 19 Jul 2013 17:10:38 +0000 (17:10 +0000)]
Merge "Make CS.isTetheringSupported dynamic" into jb-mr2-dev
Scott Main [Thu, 18 Jul 2013 23:10:37 +0000 (16:10 -0700)]
remove significant motion
Change-Id: I764d7253d9eb4aa9f7e94f5628a29f648fd9811b
Scott Main [Thu, 18 Jul 2013 22:46:11 +0000 (22:46 +0000)]
Merge "more details about account access in restricted profiles" into jb-mr2-dev
Scott Main [Thu, 18 Jul 2013 22:22:16 +0000 (15:22 -0700)]
am
991487c6: am
9a1f106d: am
34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev
* commit '
991487c635ea0cd9ccfaae8e030325c2e8be7a3f':
fix typo in code sample
Scott Main [Thu, 18 Jul 2013 22:19:39 +0000 (15:19 -0700)]
am
9a1f106d: am
34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev
* commit '
9a1f106d9ef33a3ea22d7b34d736586d4fae0447':
fix typo in code sample
Scott Main [Thu, 18 Jul 2013 22:16:46 +0000 (15:16 -0700)]
am
34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev
* commit '
34a1fa43899dc2b0b2f249262b69c922949ab626':
fix typo in code sample
Scott Main [Thu, 18 Jul 2013 22:13:55 +0000 (22:13 +0000)]
Merge "fix typo in code sample" into jb-mr1.1-ub-dev
Scott Main [Thu, 18 Jul 2013 22:09:03 +0000 (15:09 -0700)]
more details about account access in restricted profiles
Change-Id: I2710c3e8736748ca3080ee88f076255a6639b1e3
Robert Greenwalt [Thu, 18 Jul 2013 21:24:42 +0000 (14:24 -0700)]
Make CS.isTetheringSupported dynamic
It used to be set at boot, but that was too quick to pick up carrier
specific resources. With this change even if you switch sims subequent
checks get the new values.
bug:
9865616
Change-Id: I8c270c6b02fc6bdd3c3d76ceea58172df25e058d
Robert Greenwalt [Tue, 16 Jul 2013 19:06:09 +0000 (12:06 -0700)]
Add gservices updater for carrier provisioning url
bug:
9623159
Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1
Jean-Michel Trivi [Wed, 17 Jul 2013 22:38:57 +0000 (15:38 -0700)]
Cleaner Tejat notification in Audio Package 11
Add a reworked version of "Tejat", at 48kHz.
The original asset is "/data/sounds//notifications/wav/Deneb.wav".
Use this new version in Audio Package 11 under its original name.
Bug
9900161
Change-Id: I4d7c73715db4e52f5c89aeca726f8b314e0895d5
Elliott Hughes [Thu, 18 Jul 2013 17:41:41 +0000 (10:41 -0700)]
am
0bad5370: Merge "Handle missing and invalid numeric values in XmlUtils."
* commit '
0bad537093ed5b493e4c2af778cf802a2cf2c15f':
Handle missing and invalid numeric values in XmlUtils.
Elliott Hughes [Thu, 18 Jul 2013 17:38:57 +0000 (17:38 +0000)]
Merge "Handle missing and invalid numeric values in XmlUtils."
Scott Main [Thu, 18 Jul 2013 17:18:57 +0000 (10:18 -0700)]
fix typo in code sample
Change-Id: Ic2e36d321f8bc3c414f8cef82319ea376eaa296e
Elliott Hughes [Thu, 18 Jul 2013 16:36:48 +0000 (09:36 -0700)]
am
15cb526e: Merge "Fix import after okhttp update."
* commit '
15cb526ece1420b1ae2061e20fd0982d82b41aae':
Fix import after okhttp update.
Elliott Hughes [Thu, 18 Jul 2013 16:33:40 +0000 (16:33 +0000)]
Merge "Fix import after okhttp update."
Narayan Kamath [Thu, 18 Jul 2013 12:42:50 +0000 (13:42 +0100)]
Fix import after okhttp update.
OkResponseCache moved packages in change
62321.
Change-Id: I2c08c4586405e767d1931ebc5f185c7916850fa1
Dirk Dougherty [Thu, 18 Jul 2013 01:44:03 +0000 (18:44 -0700)]
resolved conflics for merge of
54201120 to jb-mr2-dev
Change-Id: If1675be05e403c33b320608333cb28ce2d9b68aa
Dirk Dougherty [Thu, 18 Jul 2013 01:19:38 +0000 (18:19 -0700)]
am
7eae1ef0: am
c7e4be8a: Doc change: Add Colopl video to carousel and spotlight.
* commit '
7eae1ef0d972911d8225de6aeebf33b806ec7037':
Doc change: Add Colopl video to carousel and spotlight.
Dirk Dougherty [Thu, 18 Jul 2013 01:16:36 +0000 (18:16 -0700)]
am
c7e4be8a: Doc change: Add Colopl video to carousel and spotlight.
* commit '
c7e4be8abdc1ce11cb0197de0e393cf39fb38c9e':
Doc change: Add Colopl video to carousel and spotlight.
Dirk Dougherty [Thu, 18 Jul 2013 01:00:35 +0000 (18:00 -0700)]
Doc change: Add Colopl video to carousel and spotlight.
Change-Id: I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93
Robert Greenwalt [Wed, 17 Jul 2013 23:46:25 +0000 (23:46 +0000)]
Merge "Add gservices updater for carrier provisioning url" into jb-mr2-dev
Jean-Michel Trivi [Wed, 17 Jul 2013 22:38:57 +0000 (15:38 -0700)]
Cleaner Tejat notification in Audio Package 11
Add a reworked version of "Tejat", at 48kHz.
The original asset is "/data/sounds//notifications/wav/Deneb.wav".
Use this new version in Audio Package 11 under its original name.
Bug
9900161
Change-Id: I4d7c73715db4e52f5c89aeca726f8b314e0895d5
Wink Saville [Wed, 17 Jul 2013 00:16:37 +0000 (17:16 -0700)]
When a SIM is changed check mobile provisioning.
A simple mechanism for doing this is to take advantage of the fact
that we require the device to reboot after a sim has been changed.
Thus when connectivity service is started we wait to get a connection
then call checkMobileProvisioning once. We also add a check that
the DEVICE_PROVISIONED is true, i.e. SetupWizard has been run.
Bug:
9784024
Change-Id: I5c1936744f6fc55a447ae44cd36eec3849d27e21
Jeff Brown [Tue, 16 Jul 2013 22:18:19 +0000 (15:18 -0700)]
Fix missing lock in power manager.
The display wake lock and other internal state could become
out of sync if we happened to execute the power manager's update
function concurrently due to the missing lock.
This bug can be trigged due to display state changes or proximity
sensor updated. Although it would be extremely rare, we have
some evidence of this happening on at least a few devices resulting
in rapid power drain with the screen off or a crash.
Bug:
9880044
Change-Id: I3c674ce429621a50cbb36c3a01883d5f388205b2
(cherry picked from commit
d91e417b06388694db213257b4df6b4dd78e0d49)
Robert Greenwalt [Tue, 16 Jul 2013 19:06:09 +0000 (12:06 -0700)]
Add gservices updater for carrier provisioning url
bug:
9623159
Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1
Wink Saville [Wed, 17 Jul 2013 18:43:30 +0000 (18:43 +0000)]
Merge "When a SIM is changed check mobile provisioning." into jb-mr2-dev
Deepanshu Gupta [Wed, 17 Jul 2013 18:38:42 +0000 (18:38 +0000)]
Merge "Add orientation to configuration for layoutlib." into jb-mr2-dev
Roman Nurik [Wed, 17 Jul 2013 16:17:14 +0000 (16:17 +0000)]
Merge "Add Flo to device art generator." into jb-mr2-dev
Wink Saville [Wed, 17 Jul 2013 00:16:37 +0000 (17:16 -0700)]
When a SIM is changed check mobile provisioning.
A simple mechanism for doing this is to take advantage of the fact
that we require the device to reboot after a sim has been changed.
Thus when connectivity service is started we wait to get a connection
then call checkMobileProvisioning once. We also add a check that
the DEVICE_PROVISIONED is true, i.e. SetupWizard has been run.
Bug:
9784024
Change-Id: I5c1936744f6fc55a447ae44cd36eec3849d27e21
Adam Powell [Wed, 17 Jul 2013 00:06:36 +0000 (17:06 -0700)]
am
30ad7203: Merge "Consider mScrollX when drawing the checkMarkDrawable"
* commit '
30ad720304790b07112b87f973a7e6ed5e1e6ee5':
Consider mScrollX when drawing the checkMarkDrawable
Adam Powell [Wed, 17 Jul 2013 00:04:28 +0000 (00:04 +0000)]
Merge "Consider mScrollX when drawing the checkMarkDrawable"
Jeff Brown [Tue, 16 Jul 2013 22:18:19 +0000 (15:18 -0700)]
Fix missing lock in power manager.
The display wake lock and other internal state could become
out of sync if we happened to execute the power manager's update
function concurrently due to the missing lock.
This bug can be trigged due to display state changes or proximity
sensor updated. Although it would be extremely rare, we have
some evidence of this happening on at least a few devices resulting
in rapid power drain with the screen off or a crash.
Bug:
9880044
Change-Id: I3c674ce429621a50cbb36c3a01883d5f388205b2
(cherry picked from commit
d91e417b06388694db213257b4df6b4dd78e0d49)
Craig Mautner [Tue, 16 Jul 2013 19:30:28 +0000 (12:30 -0700)]
Remove iterators (DO NOT MERGE)
Remove DisplayContentsIterator and AllWindowsIterator. These were cute
but they take up valuable resources. Iterate over ArrayList members
in their place.
Change-Id: Ie0c537608532cfb36f34d976cc6eacd21bad98cd
Roman Nurik [Tue, 16 Jul 2013 21:32:12 +0000 (14:32 -0700)]
Add Flo to device art generator.
Change-Id: I69e5d3ff3685c250d3c44bc616aec515ebc4835e
Craig Mautner [Tue, 16 Jul 2013 19:30:28 +0000 (12:30 -0700)]
Remove iterators (DO NOT MERGE)
Remove DisplayContentsIterator and AllWindowsIterator. These were cute
but they take up valuable resources. Iterate over ArrayList members
in their place.
Change-Id: Ie0c537608532cfb36f34d976cc6eacd21bad98cd
The Android Open Source Project [Mon, 15 Jul 2013 16:32:49 +0000 (09:32 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ib08f5c3c72f9d6eee571e7f9dff130abadffbbec