Chih-hung Hsieh
7a84739070
Merge "Use multiple patterns and emails in per-file syntax." am: d3f10fe89c
...
am: 697a0b6634
2018-09-12 13:21:25 -07:00
Tobias Thierer
1943c462cf
Merge "Fix typo in android.net.Uri documentation." am: 8dc7e43bad
...
am: 47fb98e8a4
2018-09-12 13:14:21 -07:00
Chih-hung Hsieh
697a0b6634
Merge "Use multiple patterns and emails in per-file syntax."
...
am: d3f10fe89c
2018-09-12 11:38:48 -07:00
Tobias Thierer
47fb98e8a4
Merge "Fix typo in android.net.Uri documentation."
...
am: 8dc7e43bad
2018-09-12 11:34:31 -07:00
Chih-hung Hsieh
d3f10fe89c
Merge "Use multiple patterns and emails in per-file syntax."
2018-09-12 16:27:02 +00:00
Treehugger Robot
8dc7e43bad
Merge "Fix typo in android.net.Uri documentation."
2018-09-12 15:33:36 +00:00
Mike Ma
43908f112b
Merge "Avoiding potential NPE when dumping to proto." am: a52b601ef3
...
am: 8964390dd3
2018-09-11 18:47:58 -07:00
Mike Ma
8964390dd3
Merge "Avoiding potential NPE when dumping to proto."
...
am: a52b601ef3
2018-09-11 18:26:45 -07:00
Kweku Adams
ce8e43f8d2
Avoiding potential NPE when dumping to proto.
...
Inspired by aosp/736453. Cherry-picked from ag/4934453
Bug: 113087610
Test: Android builds
Change-Id: I9f0dae9cd5a839947c7ed150980eb30b928beef7
2018-09-11 19:21:52 +00:00
Andreas Gampe
cf42e434d9
Merge "Framework: Remove a nonsensical substring(0)" am: 98627fa455
...
am: 67dffedd92
2018-09-11 10:34:11 -07:00
Andreas Gampe
67dffedd92
Merge "Framework: Remove a nonsensical substring(0)"
...
am: 98627fa455
2018-09-11 10:16:45 -07:00
Treehugger Robot
98627fa455
Merge "Framework: Remove a nonsensical substring(0)"
2018-09-11 16:30:36 +00:00
Tobias Thierer
149e506efc
Fix typo in android.net.Uri documentation.
...
This typo has been present since before the "auto import"
of cupcake sources in 2009.
Bug: 114704047
Test: Treehugger
Test: Checked through source inspection that this really returns
the encoded form: its implementation is ssp.getEncoded(),
whose implementation in turn is:
return hasEncoded ? encoded : (encoded = encode(decoded));
Change-Id: I0e4fed702e6b3012429778ccbd18a495a5d69e9f
2018-09-11 10:40:36 +01:00
Daichi Hirono
39a305ea21
Merge "Stop invoke initAppOps in Camera default constructor." am: 0890a2b51e
...
am: f98d5cb38b
2018-09-10 20:09:40 -07:00
Daichi Hirono
f98d5cb38b
Merge "Stop invoke initAppOps in Camera default constructor."
...
am: 0890a2b51e
2018-09-10 20:00:30 -07:00
Treehugger Robot
0890a2b51e
Merge "Stop invoke initAppOps in Camera default constructor."
2018-09-11 01:32:53 +00:00
Chih-Hung Hsieh
83a24d8e9b
Use multiple patterns and emails in per-file syntax.
...
Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: I46a4788c0cda69d0a3aadcf1f3dc539aa3c62fc3
2018-09-10 10:26:49 -07:00
David Brazdil
0b62a08c76
Merge "Move ApplicationInfo.usesNonSdkApi to private flags" am: fdd378c594
...
am: de5cc1ff5b
2018-09-07 04:15:02 -07:00
David Brazdil
de5cc1ff5b
Merge "Move ApplicationInfo.usesNonSdkApi to private flags"
...
am: fdd378c594
2018-09-07 03:12:59 -07:00
David Brazdil
fdd378c594
Merge "Move ApplicationInfo.usesNonSdkApi to private flags"
2018-09-07 09:32:13 +00:00
Ryan Prichard
66e6f61bb1
Merge changes from topic "b113052379-cp-from-pi-dev-p2"
...
am: c9fc995e0e
2018-09-06 14:37:27 -07:00
Eino-Ville Talvala
e0641b2619
Camera: Documentation updates for calibration and distortion correction
...
am: 96024af857
2018-09-06 14:30:42 -07:00
Ryan Prichard
c9fc995e0e
Merge changes from topic "b113052379-cp-from-pi-dev-p2"
...
* changes:
Camera: Documentation update to remove physicalIds
Camera: Documentation updates for calibration and distortion correction
2018-09-06 20:35:24 +00:00
David Brazdil
fa5e8361c4
Move ApplicationInfo.usesNonSdkApi to private flags
...
No need to create an extra field for a boolean flag. Move the recently
added ApplicationInfo.usesNonSdkApi to one bit in privateFlags.
This also solves an issue where the field was not propagated during
copying of the data structure.
Bug: 113315999
Test: phone boots
Merged-In: I09f8f39454c013a84893ac304904a4412fc542bf
Change-Id: I09f8f39454c013a84893ac304904a4412fc542bf
(cherry picked from commit a5b4df2a89
2018-09-06 15:31:33 +01:00
Michael Wachenschwanz
379daa98dd
Merge changes from topic "am-bdb0270e-8295-4ee6-be36-2709e172d48f" into oc-dev am: d32c2a4189 am: 1f5050c054 am: 4fda414ed6
...
am: 78a2caeb94
2018-09-05 20:59:25 -07:00
Michael Wachenschwanz
78a2caeb94
Merge changes from topic "am-bdb0270e-8295-4ee6-be36-2709e172d48f" into oc-dev am: d32c2a4189 am: 1f5050c054
...
am: 4fda414ed6
2018-09-05 20:23:16 -07:00
Michael Wachenschwanz
4fda414ed6
Merge changes from topic "am-bdb0270e-8295-4ee6-be36-2709e172d48f" into oc-dev am: d32c2a4189
...
am: 1f5050c054
2018-09-05 19:01:27 -07:00
Michael Wachenschwanz
1f5050c054
Merge changes from topic "am-bdb0270e-8295-4ee6-be36-2709e172d48f" into oc-dev
...
am: d32c2a4189
2018-09-05 18:46:57 -07:00
Andreas Gampe
214c76cd70
Framework: Remove a nonsensical substring(0)
...
String.substring(0) will return the same String instance. There is
also no reason to make a copy.
Found by errorprone.
Bug: 114129741
Test: m
Change-Id: Ic089f04efc3c73f70aa15a132d62ac665c8b8f4c
2018-09-05 16:58:45 -07:00
Daichi Hirono
2dba5c8417
Stop invoke initAppOps in Camera default constructor.
...
Camera default constructor does not create the underlying native camera
object. Thus calling _enableShutterSound after the default constuctor
causes application crash.
Bug: 80498247
Test: Manually modify the code to return MODE_IGNORED for
AppOpsService#checkAudioOperation() and to return false for
CameraManager#supportsCamera2ApiLocked. Then start voice call in
Hangouts.
Change-Id: Id738c4d46a8e3625bc3b1142b11acac9cfb0b603
Merged-In: Id738c4d46a8e3625bc3b1142b11acac9cfb0b603
(cherry picked from commit cb63c640cd
2018-09-05 01:51:59 +00:00
Ryan Prichard
3cd4b66ceb
Merge changes from topic "b113052379-cp-from-pi-dev-p1"
...
* changes:
Camera: hardware level related doc update
Camera: codegen doc update
2018-09-04 20:20:17 +00:00
Yohei Yukawa
045109ab03
Merge "Let SoftInputWindow handle BadTokenException" am: 680f6e802c
...
am: da916d83a0
2018-09-04 12:38:14 -07:00
Yohei Yukawa
da916d83a0
Merge "Let SoftInputWindow handle BadTokenException"
...
am: 680f6e802c
2018-09-04 12:27:47 -07:00
Treehugger Robot
680f6e802c
Merge "Let SoftInputWindow handle BadTokenException"
2018-09-04 19:08:27 +00:00
st.ji
cd6e61cd53
Merge "Add DENSITY_600" am: 8ac363088c
...
am: e79f44a393
2018-09-03 13:59:46 -07:00
st.ji
e79f44a393
Merge "Add DENSITY_600"
...
am: 8ac363088c
2018-09-03 13:50:57 -07:00
Treehugger Robot
8ac363088c
Merge "Add DENSITY_600"
2018-09-03 20:25:30 +00:00
David Brazdil
3fb373d63a
Merge "Add android:usesNonSdkApi manifest attribute" am: 9446fbbeb8
...
am: a872cb1fcc
2018-08-31 03:38:08 -07:00
David Brazdil
a872cb1fcc
Merge "Add android:usesNonSdkApi manifest attribute"
...
am: 9446fbbeb8
2018-08-31 03:28:30 -07:00
David Brazdil
9446fbbeb8
Merge "Add android:usesNonSdkApi manifest attribute"
2018-08-31 09:59:39 +00:00
Chih-hung Hsieh
e9a54af0fc
Merge "Use multiple emails in per-file syntax." am: 1d3571cb88
...
am: f106a9a2c7
2018-08-31 00:50:51 -07:00
Chih-hung Hsieh
f106a9a2c7
Merge "Use multiple emails in per-file syntax."
...
am: 1d3571cb88
2018-08-31 00:41:58 -07:00
Chih-hung Hsieh
1d3571cb88
Merge "Use multiple emails in per-file syntax."
2018-08-31 07:19:22 +00:00
Eino-Ville Talvala
96024af857
Camera: Documentation updates for calibration and distortion correction
...
- Add more notes on coordinate axes
- Add more text on metadata when distortion correction is active
- Note that poseTranslation needs to be negated in many use cases
- Fix coordinate system references for OIS reporting, add more information
- Note that pixel centers at half-integers for the camera API metadata
such as lens intrinsics
Bug: 79371566
Bug: 74434422
Bug: 109742048
Bug: 109834325
Bug: 109817371
Bug: 112107924
Bug: 113052379
Test: Manual reading of added text
Change-Id: I450e80b79ef66ce8d82a4dee835db6abd1e598a3
Merged-In: I450e80b79ef66ce8d82a4dee835db6abd1e598a3
(cherry picked from commit 08bd163e2d
2018-08-30 16:42:19 -07:00
Shuzhen Wang
44397643f4
Camera: Documentation update to remove physicalIds
...
Public API doesn't see android.logicalcam.physicalIds. Remove it
from public doc.
Bug: 112655222
Bug: 113052379
Test: make offline-sdk-docs
Change-Id: Idf6958fb7c117912e33ece4fbaed04cb8e5e14c0
Merged-In: Idf6958fb7c117912e33ece4fbaed04cb8e5e14c0
(cherry picked from commit de23d28d07
2018-08-30 16:42:19 -07:00
Yin-Chia Yeh
a8cfb0ae93
Camera: hardware level related doc update
...
Codegen doc update + CameraDevice manual update about EXTERNAL
hardware level.
Test: check offline-sdk-docs output
Bug: 77861412
Bug: 113052379
Change-Id: I70c87a176cf873cf8bec2037f973a94fe99aef2e
Merged-In: I70c87a176cf873cf8bec2037f973a94fe99aef2e
(cherry picked from commit c565700b94
2018-08-30 16:42:18 -07:00
Yin-Chia Yeh
c925656a1e
Camera: codegen doc update
...
Test: N/A. Doc update
Bug: 109666939
Bug: 113052379
Change-Id: I2bd176a7f5ada755c8a79201d142a98131e2e82c
Merged-In: I2bd176a7f5ada755c8a79201d142a98131e2e82c
(cherry picked from commit 6c73e409fc
2018-08-30 16:42:18 -07:00
Android Build Merger (Role)
7cf42221c6
[automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf am: 628cbe5c53 am: 433e4173ec am: 686897ddd9
...
Change-Id: I07c1d68a0c5d8da6ec81c717dff97d33dba86a16
2018-08-30 20:46:20 +00:00
Android Build Merger (Role)
686897ddd9
[automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf am: 628cbe5c53 am: 433e4173ec
...
Change-Id: I8375f1c1a860f5021efc5873e94b452a44d6c145
2018-08-30 20:46:12 +00:00
Android Build Merger (Role)
433e4173ec
[automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf am: 628cbe5c53
...
Change-Id: Id32bd5aa02d5689873bb311eebc87f367af9a9d9
2018-08-30 20:46:05 +00:00
