Tucker Sylvestro
5a6b44c435
Merge "DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)" into lmp-mr1-modular-dev
2015-03-05 00:15:08 +00:00
Andre Eisenbach
a0eaaa2a22
DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)
...
Bug: 18508263
Change-Id: I88f9c90dab8b0c825010c8617709449a3dd704b2
2015-03-04 17:17:20 -05:00
Craig Mautner
358188f589
Merge "Change ActivityView startActivity state sequence" into lmp-mr1-modular-dev
2015-03-03 21:03:29 +00:00
Craig Mautner
b916836e8d
Change ActivityView startActivity state sequence
...
Problems arise if an activity is started in an ActivityView when the
parent activity is not resumed. In particular the ActivityView can
be brought to the front in front of other activities that have been
started by the parent.
This change checks the state of the parent when the ActivityView is
starting and if it is not resumed, throws an Exception.
This change also removes the queueing up of Intents if the surface
does not exist when startActivity is called. Now, the owner of the
ActivityView is notified when the surface becomes available. If
startActivity is called before that notification an Exception will be
thrown.
Fixes bug 19147472.
Change-Id: I6712cf1929fe65c4238ce7f3feb4e8511ed97244
2015-03-03 10:15:21 -08:00
Joe Fernandez
559023163d
am 1137ca03: am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
...
* commit '1137ca03be9b9143c472d9adc51ea511cfd68a6b':
Minor typo fixes in managed profile Javadoc reference pages.
2015-03-03 06:42:39 +00:00
Joe Fernandez
1137ca03be
am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
...
* commit '246a3a4a797edf5850073ec8f6b8aa997947d09b':
Minor typo fixes in managed profile Javadoc reference pages.
2015-03-03 06:36:02 +00:00
Joe Fernandez
246a3a4a79
am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
...
* commit '14fcef3bf02f46a057676d7a6d755daee735c4ea':
Minor typo fixes in managed profile Javadoc reference pages.
2015-03-03 06:29:33 +00:00
Joe Fernandez
14fcef3bf0
am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
...
* commit 'c4418980a083c1cd26b789297f084e03036b5fdd':
Minor typo fixes in managed profile Javadoc reference pages.
2015-03-03 06:22:42 +00:00
Joe Fernandez
c4418980a0
am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
...
* commit 'a31378dc49868412a2e632bcc46a44877a9b397f':
Minor typo fixes in managed profile Javadoc reference pages.
2015-03-03 06:15:29 +00:00
Andrew Solovay
27f5337841
Minor typo fixes in managed profile Javadoc reference pages.
...
See first comment for stage location.
bug: 19389235
Change-Id: I2e1d5169a77e3f4000e73f08d493953ce4eee78c
2015-03-02 17:22:18 -08:00
Filip Gruszczynski
d2e8640c2c
Burn in protection.
...
Bug: 19373758
Change-Id: I7242f73acadd21bdee03262b4205c8af0734fccb
2015-02-25 12:22:49 -08:00
Jim Miller
91aa1bdb57
am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
...
* commit '19847b07e81b9b29e3574ce6ab8acf7a958a1a63':
Remove TrustAgent whitelisting API
2015-02-25 18:17:13 +00:00
Jim Miller
19847b07e8
am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
...
* commit 'b46e48067fd03b63fa5f5191651ac2a5d009e226':
Remove TrustAgent whitelisting API
2015-02-25 18:09:54 +00:00
Jim Miller
bc4f2ccf6c
Remove TrustAgent whitelisting API
...
Due to a bug caught late in the release, this API is broken
and should be removed from API 22 because it's too late for
a fix and there's no workaround.
Bug 19461292
Change-Id: Ib0757a4484b14afe7f83ae9527bb3f5f4834ee62
2015-02-24 20:15:02 -08:00
Jeff Brown
c2932a1be3
Hold a wake lock while dozing when display updates are pending.
...
When the display state is DOZE or DOZE_SUSPEND, assume this means
that the AP may go to sleep at any time so hold a wake lock for
a little while starting when traversals are scheduled to ensure
that the AP remains awake long enough to draw and post the frame
to the display hardware.
This patch is somewhat approximate but should be good enough for
most devices today.
Note that the implementation uses the window manager to ensure that
the window which wants to draw is actually visible before acquiring
the wake lock. There is a cost to this test (a round-trip) which
should not be significant today since we do not expect apps to draw
more than one frame or two while dozing. However, if we wanted to
support animations in general, we might want to optimize it or
eliminate the check altogether (since we can already account for
the app's use of the wake lock).
Another way to implement this functionality might be for the view
hierarchy to listen for the power manager to report that it has entered
a non-interactive power state before deciding to poke draw locks.
This would be somewhat more accurate than watching the display state.
Also, the draw lock timeout logic could be implemented more directly
instead of using an ordinary timed wake lock.
Bug: 18284212
Change-Id: I84b341c678303e8b7481bd1620e634fe82cc4350
2015-02-20 10:54:09 -08:00
Marco Nelissen
a3404263c0
am 2f71ee24: am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev
...
* commit '2f71ee24c5d982ccaa490c7a3e1390473909fbf0':
Fix NPE
2015-02-18 00:07:58 +00:00
Marco Nelissen
2f71ee24c5
am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev
...
* commit 'ffaee8bda9c8d22af17098fec0e6626301d91844':
Fix NPE
2015-02-18 00:01:02 +00:00
Marco Nelissen
ffaee8bda9
Merge "Fix NPE" into lmp-mr1-dev
2015-02-17 23:54:30 +00:00
Craig Mautner
28de8edb7d
am ab8f60e4: am a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'ab8f60e425a90045eca06c09f0274f402b062d8f':
Do not make ActivityContainer available to apps. DO NOT MERGE
2015-02-17 23:43:33 +00:00
Craig Mautner
ab8f60e425
am a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'a94e42970d4e664e193cde0cf2700cb7e15961c9':
Do not make ActivityContainer available to apps. DO NOT MERGE
2015-02-17 23:36:51 +00:00
Craig Mautner
a94e42970d
Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev
2015-02-17 23:30:34 +00:00
Alan Viverette
157c75e4b5
am 504c77e1: am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev
...
* commit '504c77e1ae2fdd3608cd7878a4b0ba4c9eac91de':
Fix year picker initial range
2015-02-17 22:41:15 +00:00
Alan Viverette
504c77e1ae
am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev
...
* commit 'd611fc4ea648e23ed3a6b311a07a5bd8b3e2927c':
Fix year picker initial range
2015-02-17 22:36:06 +00:00
Marco Nelissen
0e24cb7fb5
Fix NPE
...
Path can be null if sd card was ejected, and we shouldn't make a thumbnail
in that case.
Bug: 19380821
Change-Id: Iee69effdd321622de026ad7b57c74cf9da81a176
2015-02-17 14:35:37 -08:00
Alan Viverette
2a90fa6d94
Fix year picker initial range
...
BUG: 19410328
Change-Id: I2a2952eb58eb856f93b7af2f49e08abe71078aa9
2015-02-17 21:11:36 +00:00
Craig Mautner
ca0653a424
Do not make ActivityContainer available to apps. DO NOT MERGE
...
A security leak was discovered whereby a malicious app could get the
IActivityContainer object from one app and use it to inject events
into another app. This fix removes the availability of the
IActivityContainer and replaces its one use with a method for
returning the information the IActivityContainer was used for.
Fixes bug 19394591.
Change-Id: Ib3cec25b25130cd8e098892c057742cfd575cfdd
2015-02-17 20:41:39 +00:00
Svetoslav
5136791b34
am 599c1042: Accessibility: Ensure fresh accessilbity focused and input focused nodes. automerge: 27ad2e9
...
* commit '599c1042896564906935bc688bbb85515a6dfa45':
Accessibility: Ensure fresh accessilbity focused and input focused nodes.
2015-02-13 03:43:29 +00:00
Svetoslav
599c104289
Accessibility: Ensure fresh accessilbity focused and input focused nodes.
...
automerge: 27ad2e9
2015-02-13 03:37:00 +00:00
Svetoslav
27ad2e95b4
Accessibility: Ensure fresh accessilbity focused and input focused nodes.
...
Change-Id: Ia3c84284843a415cdbbc2b6a9b06d9ddffbe0e04
2015-02-13 01:59:11 +00:00
Ruben Brunk
fb7c14c5f9
am 41af9d59: Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev automerge: d2ccbd4
...
* commit '41af9d592efbae88ed95ab77a856dd4e8fbab998':
camera2: Fix legacy scaling factor application.
2015-02-13 01:33:42 +00:00
Ruben Brunk
41af9d592e
Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev
...
automerge: d2ccbd4
2015-02-13 01:28:23 +00:00
Ruben Brunk
d2ccbd43d2
Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev
2015-02-13 01:22:26 +00:00
Ruben Brunk
259f3d90b8
camera2: Fix legacy scaling factor application.
...
Bug: 19359916
Change-Id: I22204c50ac918b9be97b5d43efa73c7e87444cea
2015-02-12 13:27:26 -08:00
Jeremy Joslin
1267462c0b
am f456d4dc: am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
...
* commit 'f456d4dcc042581cb2a3ba540538898f2cc925b7':
Update Javadoc for EXTRA_NETWORK.
2015-02-12 18:47:14 +00:00
Jeremy Joslin
f456d4dcc0
am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
...
* commit '20be0e25ba660a7555577988cefcfa36d84e7e2f':
Update Javadoc for EXTRA_NETWORK.
2015-02-12 18:41:17 +00:00
Jeremy Joslin
20be0e25ba
Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
2015-02-12 18:34:03 +00:00
Benjamin Franz
dd0027cfda
am 40ab8bb2: am c70d0e71: Fix the javadocs for lock task mode intents.
...
* commit '40ab8bb22979b9e7c76e016b861319f6103eb800':
Fix the javadocs for lock task mode intents.
2015-02-12 16:52:34 +00:00
Benjamin Franz
40ab8bb229
am c70d0e71: Fix the javadocs for lock task mode intents.
...
* commit 'c70d0e71c09da0292958d748cedaa5fbacbec74a':
Fix the javadocs for lock task mode intents.
2015-02-12 16:45:06 +00:00
Benjamin Franz
c70d0e71c0
Fix the javadocs for lock task mode intents.
...
Bug: 19363651
Change-Id: Ia0da3ddad587ea842aad19818a62540889d6a9dd
2015-02-12 16:12:58 +00:00
Jeremy Joslin
fcde58f155
Update Javadoc for EXTRA_NETWORK.
...
Bug: 19352840
Change-Id: Ib668bee0fb2c6f5bcd01a7908ebd20b9ec8a40ef
2015-02-11 18:28:57 -08:00
Adam Powell
97e0ba6912
am b73e029f: am 0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev
...
* commit 'b73e029fea53fd5aeaf01ad7ba15560329d8de1c':
Add DENSITY_280
2015-02-12 02:25:29 +00:00
Adam Powell
b73e029fea
am 0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev
...
* commit '0ec652cf72bd8b7f619462f172ac0152d4d6c83d':
Add DENSITY_280
2015-02-12 02:13:03 +00:00
Adam Powell
0ec652cf72
Merge "Add DENSITY_280" into lmp-mr1-dev
2015-02-12 02:08:04 +00:00
Adam Powell
f6d4045d6c
Add DENSITY_280
...
Bug 19350604
Change-Id: I94f5162c31f9c8853908d7c4699974c236cc7fe7
2015-02-11 13:34:43 -08:00
Nick Vaccaro
f5021f6818
Update API to contain new wrist tilt sensor type and string.
...
Convert the wrist tilt sensor from being a vendor-defined sensor
type to being an official android sensor type.
Change-Id: I39807bdca4f4c853fa0f7e88e6d98c02245f2a8b
2015-02-10 20:43:44 +00:00
Svetoslav
cf2c8545bd
am 5521f39f: am c73cfa0f: Accessibiltiy: missed update to the previous patch.
...
* commit '5521f39ff75d2af909061581e27810afaa9ed242':
Accessibiltiy: missed update to the previous patch.
2015-02-10 03:01:50 +00:00
Svetoslav
5521f39ff7
am c73cfa0f: Accessibiltiy: missed update to the previous patch.
...
* commit 'c73cfa0ffba344a83d61e2f4eb9715152a2807b8':
Accessibiltiy: missed update to the previous patch.
2015-02-10 02:51:30 +00:00
Svetoslav
c73cfa0ffb
Accessibiltiy: missed update to the previous patch.
...
Change-Id: I4c47d38f5e137dcc1c6db0561b3824a26572027d
2015-02-09 18:33:07 -08:00
Baligh Uddin
2083173af9
am fbf9666f: am b2ba6dfc: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
...
* commit 'fbf9666f846284ee1d4d09e2d36f0d2b92120656':
Accessibility: Handle a missed case when clicking focused views.
2015-02-10 01:17:42 +00:00
Baligh Uddin
fbf9666f84
am b2ba6dfc: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
...
* commit 'b2ba6dfc7b33ec9e58d9f556206440a26069e264':
Accessibility: Handle a missed case when clicking focused views.
2015-02-10 01:07:08 +00:00
