Shreyas Basarge
c9eb8b4367
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d
...
am: 64bdb9f06b
* commit '64bdb9f06b7fc3e497088243a966dec95d1936e1':
Sync extras bundle comparison can throw NPE
2015-11-13 02:29:47 +00:00
Shreyas Basarge
64bdb9f06b
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e
...
am: 359ee7f47d
* commit '359ee7f47de2eee82951abed294e4db44405973c':
Sync extras bundle comparison can throw NPE
2015-11-13 02:23:40 +00:00
Shreyas Basarge
359ee7f47d
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4
...
am: bf29f10c1e
* commit 'bf29f10c1e7dd37c3020bc7a792bb7bda451a149':
Sync extras bundle comparison can throw NPE
2015-11-13 02:16:24 +00:00
Shreyas Basarge
bf29f10c1e
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af
...
am: 44368e6dd4
* commit '44368e6dd4ec56e9eca47b1e81d307f672bb3006':
Sync extras bundle comparison can throw NPE
2015-11-13 02:09:36 +00:00
Matthew Williams
af5c9f809c
Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74
...
am: c455148edc
* commit 'c455148edce05b4862df8853a78276fb5f28151a':
Sync extras bundle comparison can throw NPE
2015-11-13 02:09:35 +00:00
Matthew Williams
c455148edc
Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f
...
am: 6d13650c74
* commit '6d13650c74b7cab047e43a4a3a0b880a832dd2db':
Sync extras bundle comparison can throw NPE
2015-11-13 02:03:01 +00:00
Shreyas Basarge
44368e6dd4
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812
...
am: f5f03a19af
* commit 'f5f03a19affc6775ac3e44a3540351e132fffc0e':
Sync extras bundle comparison can throw NPE
2015-11-13 02:03:01 +00:00
Shreyas Basarge
f5f03a19af
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8
...
am: cc7c1d3812
* commit 'cc7c1d381249edfd906cb57afbd8589e6c345141':
Sync extras bundle comparison can throw NPE
2015-11-13 01:56:34 +00:00
Matthew Williams
6d13650c74
Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2
...
am: a0d20db02f
* commit 'a0d20db02f0e6cfc06ec37cfc68ce626dd35858a':
Sync extras bundle comparison can throw NPE
2015-11-13 01:56:30 +00:00
Matthew Williams
a0d20db02f
Sync extras bundle comparison can throw NPE am: c0f39c1ece
...
am: 34b700a7c2
* commit '34b700a7c2355f1dbea4b8d796619033bdd87a0c':
Sync extras bundle comparison can throw NPE
2015-11-13 01:50:11 +00:00
Shreyas Basarge
cc7c1d3812
Sync extras bundle comparison can throw NPE am: 2f137b7705
...
am: 294611faa8
* commit '294611faa8bd1bdbf75adc3cee835b69d348df86':
Sync extras bundle comparison can throw NPE
2015-11-13 01:50:02 +00:00
Matthew Williams
34b700a7c2
Sync extras bundle comparison can throw NPE
...
am: c0f39c1ece
* commit 'c0f39c1ece72a05c796f7ba30b7a2b5b580d5025':
Sync extras bundle comparison can throw NPE
2015-11-13 01:41:59 +00:00
Shreyas Basarge
294611faa8
Sync extras bundle comparison can throw NPE
...
am: 2f137b7705
* commit '2f137b7705875ee026319abb8e512d918c118222':
Sync extras bundle comparison can throw NPE
2015-11-13 01:41:59 +00:00
Shreyas Basarge
2f137b7705
Sync extras bundle comparison can throw NPE
...
Bug: 23591205
Change-Id: I960dfcc1584c0a17685790d5d722eaf11b930e25
2015-11-12 15:32:44 +00:00
Eino-Ville Talvala
d8407271ff
Camera: Documentation updates
...
- Clarify hardware.camera feature being only for the back camera
- Clarify what setting a CaptureRequest field to null does
- Use preCorrectionActiveArray instead of activeArray in list of
possible raw output sizes
- Clarify length of GPS processing field for camera1 API
Bug: 24540625
Bug: 23908116
Bug: 23051627
Bug: 17345901
Change-Id: Iaf11fdf626268cf30f66b3628153ec3ac770c4f4
2015-11-11 23:59:38 +00:00
Matthew Williams
c0f39c1ece
Sync extras bundle comparison can throw NPE
...
BUG: 23591205
Change-Id: Ic6404c0befe70c34b078e0eae6a627826173d82c
(cherry picked from commit 9ad2c8403354a985258c098681067e74b9e2f638)
2015-11-11 14:34:04 +00:00
Dan Sandler
e68e70d509
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a -s ours am: 410bea181b am: 511357c39b
...
am: 7e16b2e8f5 -s ours
* commit '7e16b2e8f5b74d29711d330f6982d8ed12c3f4db':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-24 00:33:48 +00:00
Dan Sandler
7e16b2e8f5
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a -s ours am: 410bea181b
...
am: 511357c39b
* commit '511357c39b058b0d03beb175c1c35990729ee3d0':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-24 00:15:49 +00:00
Dan Sandler
ab4857790b
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 am: 6026b5b17e
...
am: 6c3186ea07 -s ours
* commit '6c3186ea07a735d84e9a33e9864366b01f1f4c86':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-24 00:04:17 +00:00
Dan Sandler
511357c39b
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a -s ours
...
am: 410bea181b
* commit '410bea181b229adef7a2c1a9308379eead260706':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-24 00:04:06 +00:00
Dan Sandler
6c3186ea07
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77
...
am: 6026b5b17e
* commit '6026b5b17e786c180909d8fe5f6747e446e1d365':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-23 23:49:56 +00:00
Dan Sandler
410bea181b
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3
...
am: b1de85487a -s ours
* commit 'b1de85487af1726c3d9e80d78bd643f550d9f3a4':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-23 23:49:54 +00:00
Dan Sandler
6026b5b17e
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
...
am: 51c2619c77
* commit '51c2619c7706575a171cf29819db14e91b815a62':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-23 23:39:50 +00:00
Dan Sandler
b1de85487a
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
...
am: 1044e162c3
* commit '1044e162c3dc4169b79112fc1a2de14757bca8c3':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-23 23:39:22 +00:00
Dan Sandler
1044e162c3
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
...
Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.
Bug: 19121797
(cherry picked from commit 8fd25bf7711aabffe73213ba1f9056f285270695)
Change-Id: I14d9fb54521dc6d60822e7c683e4e92fd62cdc6a
2015-10-23 01:38:51 +00:00
Dan Sandler
51c2619c77
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
...
Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.
(cherry picked from commit 8fd25bf7711aabffe73213ba1f9056f285270695)
Bug: 19121797
Change-Id: I7a5c12b371b735c756ca5a3e8716c385fb3fbfe9
2015-10-23 01:38:36 +00:00
Dan Sandler
446dcc9ed7
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
...
Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.
Bug: 19121797
Change-Id: I52b69b2029439d42163ead5dc8748889b4f61934
(cherry picked from commit 8fd25bf7711aabffe73213ba1f9056f285270695)
2015-10-23 01:37:52 +00:00
Dianne Hackborn
e34445f11a
Merge "Docs only change: update build version docs." into mnc-dev
2015-10-15 00:56:05 +00:00
Adrian Roos
31f19c444f
Merge "Send next alarm's show intent via PendingIntent" into mnc-dev
2015-10-15 00:29:56 +00:00
Yin-Chia Yeh
a636be6c9a
Camera: fix wrong FULL feature string
...
Bug: 24678065
Change-Id: I2ca49565b919c87005d941863e22e3852a01a6c6
2015-10-06 13:45:20 -07:00
Adam Lesinski
46684d2cae
Merge "Add anydpi to the providing-resources docs" into mnc-dev
2015-10-05 22:31:22 +00:00
Adam Lesinski
4cad00b696
Add anydpi to the providing-resources docs
...
Change-Id: Ic108d9da2e39b9f8581311fe610a1959a24a732f
2015-10-05 19:39:40 +00:00
Jianing Wei
2813b0fae9
Camera2: Update video stabilization API doc.
...
Bug: 23353979
Change-Id: I781006d1b6ebbdf522ebbf6acc35b2062aff76b6
2015-09-29 16:04:14 -07:00
Billy Lau
f360bbca96
Merge "Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev
2015-09-28 17:18:30 +00:00
Dianne Hackborn
e7a3435c91
Docs only change: update build version docs.
...
Change-Id: I30f55549394693ea04cd390b1ae66347ae212123
2015-09-24 17:32:26 -07:00
Adrian Roos
09945c0bde
am fe7ceca1: (-s ours) am 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
...
* commit 'fe7ceca1acdbcde6449f57bb19b45f8c948cc1f5':
DO NOT MERGE Send next alarm's show intent via PendingIntent
2015-09-24 23:32:01 +00:00
Adrian Roos
fe7ceca1ac
am 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
...
* commit '9ceec2f0f007e05ed2842f222b4f652bdd69eb3f':
DO NOT MERGE Send next alarm's show intent via PendingIntent
2015-09-24 23:25:48 +00:00
Adrian Roos
9ceec2f0f0
am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
...
* commit 'f6c7515817f9a4c24d2ff9baba2f916795862098':
DO NOT MERGE Send next alarm's show intent via PendingIntent
2015-09-24 23:11:55 +00:00
Adrian Roos
f6c7515817
am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
...
* commit '12c54dfa1219c5bb81482fe4bd4b164637f2e8b2':
DO NOT MERGE Send next alarm's show intent via PendingIntent
2015-09-24 22:59:37 +00:00
Adrian Roos
12c54dfa12
am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
...
* commit 'c9f7abe3705f7c74ad768e0a8e093f6f11e70e1c':
DO NOT MERGE Send next alarm's show intent via PendingIntent
2015-09-24 22:49:19 +00:00
Adrian Roos
c9f7abe370
Merge "DO NOT MERGE Send next alarm's show intent via PendingIntent" into lmp-dev
2015-09-24 22:39:23 +00:00
Paul Jensen
9971167fbe
am 5ebe8e26: am 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev
...
* commit '5ebe8e26f2c9517ce321a0fbcbed6efe2960da47':
Don't mark NetworkRequests restricted when they don't have restricted caps
2015-09-23 14:42:02 +00:00
Paul Jensen
62bb18976f
am 554cecea: (-s ours) am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
...
* commit '554cecea4c5e39c25efb721258366ce12e6b861c':
Fix NOT_RESTRICTED network capability and enforce it.
2015-09-23 14:41:57 +00:00
Paul Jensen
5ebe8e26f2
am 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev
...
* commit '4cbfe3316fd1105b697a9838ef7bafaebf5080a2':
Don't mark NetworkRequests restricted when they don't have restricted caps
2015-09-23 11:33:18 +00:00
Paul Jensen
554cecea4c
am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
...
* commit '10a7d7449dae2aabf4f22f980e7efabf274a939a':
Fix NOT_RESTRICTED network capability and enforce it.
2015-09-23 11:33:13 +00:00
Paul Jensen
4cbfe3316f
am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev
...
* commit '773d71e7c45d12810267bb24735360da6e5b258d':
Don't mark NetworkRequests restricted when they don't have restricted caps
2015-09-23 11:21:27 +00:00
Paul Jensen
10a7d7449d
am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
...
* commit '96cd7c14b5e4a82727f7b56bbdf6cfafda0f17b6':
Fix NOT_RESTRICTED network capability and enforce it.
2015-09-23 11:21:22 +00:00
Paul Jensen
773d71e7c4
am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev
...
* commit '962c3a0f2dd46d55ea591671c0a90c1c40214af7':
Don't mark NetworkRequests restricted when they don't have restricted caps
2015-09-23 11:13:48 +00:00
Paul Jensen
96cd7c14b5
am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
...
* commit '635f871132449bea7489f6a61276979beeee5591':
Fix NOT_RESTRICTED network capability and enforce it.
2015-09-23 11:13:40 +00:00
Paul Jensen
962c3a0f2d
am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev
...
* commit 'ece4ac2105d18d8d7b6296d6de3fdd5641c35258':
Don't mark NetworkRequests restricted when they don't have restricted caps
2015-09-23 11:06:32 +00:00