John Reck
d955dceb4f
am 862540cd: Merge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into lmp-mr1-dev
...
* commit '862540cdb11a7128ae1fd670136f398645b4af7b':
Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
2015-05-14 00:51:07 +00:00
John Reck
862540cdb1
Merge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into lmp-mr1-dev
2015-05-14 00:40:45 +00:00
John Reck
a5b28b92b1
am 69355eaa: Merge "DO NOT MERGE Backport of limited jank-tracking metrics" into lmp-mr1-dev
...
* commit '69355eaa1c1f4bfc961d5dd9fdb0f3817d36d5f0':
DO NOT MERGE Backport of limited jank-tracking metrics
2015-05-13 21:52:50 +00:00
John Reck
25607a6642
Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
...
This reverts commit 2614bd225f
2015-05-13 21:42:28 +00:00
John Reck
69355eaa1c
Merge "DO NOT MERGE Backport of limited jank-tracking metrics" into lmp-mr1-dev
2015-05-13 21:42:13 +00:00
Svet Ganov
db672b6cde
am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev
...
* commit '00e91901fd1dd007de196ada04e3fc2f79e1be73':
DO NOT MERGE Don't take flags when creating app widget config activity.
2015-04-23 15:18:10 +00:00
Svet Ganov
68e6b5055b
DO NOT MERGE Don't take flags when creating app widget config activity.
...
bug:19618745
Change-Id: I7973ebfc67ebf52f14890dda9eb891a7b8a5a095
2015-04-20 17:16:38 +00:00
Quddus Chong
c736e8cf41
am f0ab39c1: Merge "Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873" into lmp-mr1-dev
...
* commit 'f0ab39c10b614514ba4a600aa6fd4354253cde73':
Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873
2015-04-08 17:53:44 +00:00
Quddus Chong
a9f6a9b769
Fixed broken link in UiAutomation.setRunAsMonkey() method description.
...
bug: 19711873
Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e
2015-04-07 13:04:39 -07:00
Svetoslav
c6be7545b4
am 37661db7: AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
...
* commit '37661db7fa58c0559ef2b73b6f8c38124e3acd4a':
AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
2015-03-31 16:33:21 +00:00
Svetoslav
37661db7fa
AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
...
AccessibilityNodeInfo refresh was getting the latest cached
state but this is not good enough as an accessibility service
can execute an action on the node and then refresh it to get
the new state.
bug:16954787
Change-Id: I004b4987b8dc423a2ab7031a4fbfe64365ddd7fe
(cherry picked from commit 5738fec00d
2015-03-31 01:25:35 +00:00
John Reck
2614bd225f
DO NOT MERGE Backport of limited jank-tracking metrics
...
Bug: 19821830
Cherry-pick of ba6adf66d3e70c5754d0
2015-03-18 14:22:01 -07:00
Kenny Root
693ea60e9e
Track change to Conscrypt
...
Change way in which an outside caller can get the preferred SSLContext.
(cherry picked from commit 8a97063720
2015-03-17 21:27:05 +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
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
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
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
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
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
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
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
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
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
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
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
Baligh Uddin
b2ba6dfc7b
Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
2015-02-10 00:57:21 +00:00
Andre Eisenbach
3ca77ccf87
am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev
...
* commit '455502b7501bdbc55a739083878431c3ba7ef81a':
Add API to check if a Bluetooth connection is encrypted (1/2)
2015-02-10 00:26:51 +00:00
Andre Eisenbach
455502b750
Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev
2015-02-10 00:21:43 +00:00
Matthew Xie
d67aff686d
am a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev
...
* commit 'a63ba4287e5c87f41cd7d4b43111fd18f3ec499b':
Separate the protection of mProxyServiceStateCallbacks from that of mService
2015-02-09 21:59:13 +00:00
Matthew Xie
a63ba4287e
Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev
2015-02-09 21:50:58 +00:00
Amith Yamasani
d09878c13c
am 61333d1b: Merge "Limit cache update to packages that have changed" into lmp-mr1-dev
...
* commit '61333d1b51ae36c9e5b1f4ea95bd00731c5e991a':
Limit cache update to packages that have changed
2015-02-09 20:05:32 +00:00
