Commit Graph

83609 Commits

Author SHA1 Message Date
Andreas Gampe
67dffedd92 Merge "Framework: Remove a nonsensical substring(0)"
am: 98627fa455

Change-Id: Iede6825cef351b4021dc1166b262124cefdfdca2
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
Daichi Hirono
f98d5cb38b Merge "Stop invoke initAppOps in Camera default constructor."
am: 0890a2b51e

Change-Id: I6ed52f595757c3ca7308969105f05e6bd55dee65
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
David Brazdil
de5cc1ff5b Merge "Move ApplicationInfo.usesNonSdkApi to private flags"
am: fdd378c594

Change-Id: I43fe6b903eb4cd900da9ebc2b10893213329c691
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

Change-Id: Ia83844fa93a02234178042be85cc99eaeaca221f
2018-09-06 14:37:27 -07:00
Eino-Ville Talvala
e0641b2619 Camera: Documentation updates for calibration and distortion correction
am: 96024af857

Change-Id: Ie07f7074a0347f63cd8c6f2bb715efbdba8b717f
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
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
da916d83a0 Merge "Let SoftInputWindow handle BadTokenException"
am: 680f6e802c

Change-Id: I6f9c1ff99ee9cc2157e32ebe3c0ff3faa2b6bf7f
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
e79f44a393 Merge "Add DENSITY_600"
am: 8ac363088c

Change-Id: I92fac616676fb93fcbe1ddc59b2e577b551cb387
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
a872cb1fcc Merge "Add android:usesNonSdkApi manifest attribute"
am: 9446fbbeb8

Change-Id: I53b5c85fc16cdea5413b35ba4ddeec0d64f22b11
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
f106a9a2c7 Merge "Use multiple emails in per-file syntax."
am: 1d3571cb88

Change-Id: Iaf7f8d314afe7d03cd119a861f94da10a9666a84
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
Mathew Inwood
2e5fdd0051 Merge "Add @UnsupportedAppUsage annotations"
am: 9137ecafbd

Change-Id: I467341cc8f70554f58266ddc28ff3a648ec5cc18
2018-08-30 08:57:54 -07:00
David Brazdil
ca6f81d395 Add android:usesNonSdkApi manifest attribute
ActivityManagerService decides on the non-SDK API enforcement policy
of every newly spawned process. System apps can be exempted by adding
their package name to a config XML file, tests can pass a flag to
'am instrument'. This patch adds a new @hide attribute on the <application>
manifest tag, "android:usesNonSdkApi", which can be used by both
system apps and tests, and is automatically set by the build system.

The use of the attribute remains guarded as follows:
- if invoked via 'am instrument', must hold shell user permission,
- if app launched, must be a system app or an updated system app.
The attribute is ignored in all other cases.

Bug: 113315999
Test: N/A
Merged-In: I2f6cb56f63fa2c5dd6c7c25fcefe8205da1ec96a
Change-Id: I2f6cb56f63fa2c5dd6c7c25fcefe8205da1ec96a
(cherry picked from commit 787b6f22a6)
2018-08-30 14:10:33 +01:00
Mathew Inwood
71da3a1fe4 Add @UnsupportedAppUsage annotations
For all remaining unannotated code.

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Change-Id: I32861fa341a08f11a9c50c07a1ef7404dadf6bb6
Merged-In: I67c8b71ea535ebffb10bf577948bd4ccb8ca069d
2018-08-30 13:38:01 +01:00
Yohei Yukawa
13a9ffba01 Let SoftInputWindow handle BadTokenException
After several attempts [1][2], this is our latest attempt to
gracefully ignore BadTokenException an IME that is being destroyed is
still handling pending showSoftInput() requests.

The point is that SoftInputWindow is a hidden API. This means that
instead of adding a bunch of try/catch blocks around mWindow.show() in
InputMethodService we can always override SoftInputWindow#show() to
inject our own code around mWindow.show().

With this CL, we can now fully track the internal lifecycle of
SoftInputWindow in SoftInputWindow#mWindowState.  It enables us to
easily sort out cases like double fault cases discussed
in Bug 113159114, where showSoftInput() requests were queued multiple
times and still IMEs crash because what mWindow.show() throws for
the 2nd failure is IllegaStateException not BadTokenException.

 [1] Id1e5f236f48c8ef01b7f157ba3f6e7ab2c26b135
     6fcbb56290
 [2] I2c21573cf972145ab08e66604cdb9344139a3f31
     e4bbb1cc45

Fix: 113159114
Test: Manually verified IME switching scenario as follows.
  1. Build and flush aosp_taimen-userdebug
  2. make -j SoftKeyboard
  3. adb install -r $OUT/system/app/SoftKeyboard/SoftKeyboard.apk
  4. adb shell ime enable com.example.android.softkeyboard/.SoftKeyboard
  5. Open the Dialer app and tap the top edit field.
  6. Make sure that AOSP Keyboard is shown.
  7. Tap the globe button on AOSP Keyboard.
  8. Make sure that AOSP Keyboard is dismissed and SoftKeybaord is
     shown.
  9. Tap the globe button on SoftKeybaord.
 10. Make sure that SoftKeybaord. is dismissed and AOSP Keyboard is
     shown again.
Test: atest CtsInputMethodTestCases CtsInputMethodServiceHostTestCases
Change-Id: I1f51ed29df6b22b003ca285698e06b8f3ee5106a
2018-08-29 19:56:02 -07:00
Jakub Pawlowski
253403081a Merge "BLE: Add service solicitation uuid feature in scan filter"
am: 13d6540956

Change-Id: I1a708d573b412bd556912b163d99f774bbef05b4
2018-08-29 04:37:54 -07:00
Nitin Shivpure
1555eae7fa BLE: Add service solicitation uuid feature in scan filter
Adding service solicitation uuid feature in
scan filter, So BLE Scanner can set scan filter for
advertising packets that includes the Service Solicitation
uuid, which can be one of the below types.
 - List of 16 bit Service UUIDs
 - List of 32 bit Service UUIDs
 - List of 128 bit Service UUIDs

Test: BLE Scanner can do filter scan for advertising packets that
includes the Service Solicitation uuid.

Bug: 78483310
Change-Id: I3d83c50e446fca06a76db002dad716759c145d6e
2018-08-29 07:40:29 +00:00
Remi NGUYEN VAN
0f78680ce2 Merge "Add global setting to use new DHCPv4 server"
am: 64dda3cf18

Change-Id: I3476e8e53247d086ca38e18c8713bb17396c6dfd
2018-08-28 23:40:02 -07:00
Remi NGUYEN VAN
64dda3cf18 Merge "Add global setting to use new DHCPv4 server" 2018-08-29 06:24:40 +00:00
Remi NGUYEN VAN
dccc1866de Merge "Add DhcpServer"
am: e3a0f42e8e

Change-Id: I4ce2cb61d084b37681e1f5103a4e31d4af1cae3e
2018-08-28 20:32:54 -07:00
Remi NGUYEN VAN
e3a0f42e8e Merge "Add DhcpServer" 2018-08-29 03:19:27 +00:00
Erik Kline
0bd9ac4b69 Merge "Remove ResolveUtil from frameworks/base callers"
am: 0e1621296f

Change-Id: Ibc885ccd9531706df029154f7ec4fde71bf600d1
2018-08-28 20:12:49 -07:00
Treehugger Robot
0e1621296f Merge "Remove ResolveUtil from frameworks/base callers" 2018-08-29 02:58:08 +00:00
Jeff Sharkey
4c9108ca39 Merge "Q."
am: 20cc0ef048

Change-Id: I044403f837d4cfc4d1046357e4286ab95caf9865
2018-08-28 12:31:07 -07:00
Chih-Hung Hsieh
bb6b0f578a Merge "Use multiple patterns and emails in per-file syntax."
am: 7dd3f1dca6

Change-Id: Ie42e3a24b72c7177fe03a7f14bc346e19fa83932
2018-08-28 12:26:32 -07:00
Treehugger Robot
20cc0ef048 Merge "Q." 2018-08-28 18:40:11 +00:00
Treehugger Robot
7dd3f1dca6 Merge "Use multiple patterns and emails in per-file syntax." 2018-08-28 18:28:23 +00:00
Jeff Sharkey
5c877634ae Q.
Clean cherry-pick of ag/4057716.

Bug: 77588754
Test: builds, boots
Change-Id: Ib1d993fe2949f480a350acfa7e2b3cfdc7abd257
Merged-In: Ib1d993fe2949f480a350acfa7e2b3cfdc7abd257
2018-08-28 17:51:35 +00:00
Mathew Inwood
5e99817407 Merge "Add <p> to UnsupportedAppUsage javadoc."
am: dfd7bc77c3

Change-Id: I7e9c71304d072d0883b004760d489637a1ff4b96
2018-08-28 08:54:05 -07:00
Mathew Inwood
48ae9cdf62 Merge "Add myself as OWNERS for UnsupportedAppUsage.java."
am: 0589adc790

Change-Id: I063c30a288ea9da59cfe4a55be3e6d63ee573a1f
2018-08-28 08:50:00 -07:00
Treehugger Robot
dfd7bc77c3 Merge "Add <p> to UnsupportedAppUsage javadoc." 2018-08-28 15:30:29 +00:00
Treehugger Robot
0589adc790 Merge "Add myself as OWNERS for UnsupportedAppUsage.java." 2018-08-28 15:24:23 +00:00
Mathew Inwood
8ea8654bae Add <p> to UnsupportedAppUsage javadoc.
To make HTML rendering of it readable.

Test: m
Change-Id: Ie829b422d6d905f44a909e4a402b61169268e940
2018-08-28 10:52:51 +01:00
Remi NGUYEN VAN
0597453f7c Add global setting to use new DHCPv4 server
The setting applies to the choice of DHCPv4 server for tethering.

Bug: b/109584964
Test: Still builds, SettingsBackupTest passes
Change-Id: Id9b5820883eaf3148f09ad948c34795b3619a30e
2018-08-28 17:47:04 +09:00
Erik Kline
f4fa982339 Remove ResolveUtil from frameworks/base callers
Use the Private DNS bypass logic that was moved into Network.

Once all callers of ResolvUtil are updated to use this interface
ResolvUtil can be deleted.

Test: as follows
    - built, flashed, booted
    - runtest frameworks-net passes
    - connection to captive portal network detects portal correctly
      and the login activity functions as expected

Bug: 64133961
Bug: 72345192
Bug: 73872000
Bug: 78548486

Change-Id: If11ef2b5ffdc729f8449cf18dccd5f1eccbc51e6
2018-08-28 12:59:21 +09:00
Remi NGUYEN VAN
a13007ad0f Add DhcpServer
This first version can serve discover/request/release, although there
are some small behavior changes with current implementation which will
be addressed later.

Also removes final modifiers on start() and stop() in FdEventsReader, to
allow mocking the methods in tests with the current mockito lib.

Test: Added tests pass, manual: flashed a device using the server
Change-Id: I025366ff7d51c4ba31152af50f3dd2b5e280a54d
2018-08-28 12:50:47 +09:00