316295 Commits

Author SHA1 Message Date
TreeHugger Robot
ca1bd4b541 Merge "Add isSmallBatteryDevice flag to ActivityManager." 2017-04-14 22:42:06 +00:00
Yifan Hong
585ffd1cb3 Update for removing mount arg to VintfObject::CheckCompatibility
It is default to false.

Test: pass
Bug: 36814503

Change-Id: Ib06850d3355f54996b17cc6c2980a7d17af132e5
2017-04-14 15:41:32 -07:00
Jeff Sharkey
9a4a457622 Clear identity to handle ALLOCATE_AGGRESSIVE.
We're not actually clearing any files, only deciding how much free
space is available, so we're fine assuming the remote caller has the
permission.

Test: builds, boots
Bug: 37169076
Change-Id: I6cd42f77c43e9d2de40e2b8b937c7f2145f1b869
2017-04-14 16:29:04 -06:00
Seigo Nonaka
16caccbcd9 Merge "Fix boot loop issue on Android Wear." into oc-dev am: 5f9fde884b
am: f08388e8ea

Change-Id: I5c61dfb5166e4456f55ef79a122c8fc0b312ed86
2017-04-14 22:24:34 +00:00
Seigo Nonaka
f08388e8ea Merge "Fix boot loop issue on Android Wear." into oc-dev
am: 5f9fde884b

Change-Id: Ie73c0cfd4c348d1217338bb40694f20559702bcb
2017-04-14 22:20:35 +00:00
TreeHugger Robot
5f9fde884b Merge "Fix boot loop issue on Android Wear." into oc-dev 2017-04-14 22:16:22 +00:00
Philip P. Moltmann
fe48dab741 Merge "Fix some racines in AutofillManager" into oc-dev am: 2ddd69ce1a
am: ae774ec189

Change-Id: Ic035560141f16118a4fefb3bb0f65edd6bd228cc
2017-04-14 22:16:02 +00:00
Philip P. Moltmann
ae774ec189 Merge "Fix some racines in AutofillManager" into oc-dev
am: 2ddd69ce1a

Change-Id: Iec8454a36985484148b821f598446d5305c601bc
2017-04-14 22:11:06 +00:00
TreeHugger Robot
2ddd69ce1a Merge "Fix some racines in AutofillManager" into oc-dev 2017-04-14 22:04:38 +00:00
Badhri Jagan Sridharan
2d08709300 Merge "Repost USB and ADB notification when locale changes" 2017-04-14 21:58:24 +00:00
Amith Yamasani
e99757e4b1 MASTER_CLEAR action should not be public
Limit it to SystemApi, for passing intent tests

Bug: 36977779
Test: cts test
Change-Id: I716b94fc3cef43db1fafbfdad8dba0d850bec474
2017-04-14 14:41:45 -07:00
Philip P. Moltmann
44a4336027 Remove autofillMode attribute
Bug: 36171235
Test: CtsAutoFillServiceTestCases
Change-Id: I69f0e1c4fa3c68f73049726e7ae8f10d9d81bf5e
2017-04-14 14:35:14 -07:00
Android Build Merger (Role)
e3852d3302 Merge "Merge "Add BitmapFactory.Options.inColorSpace" into oc-dev am: c99bcc69f7 am: f713a1960e" 2017-04-14 21:20:48 +00:00
Sudheer Shanka
bc308988bd Add new api Activity.getStartInitiatedTime.
This api will return the timestamp at which this activity start was last
initiated by the system. Implementation is wip.

Bug: 9058261
Test: cts-tradefed run singleCommand cts-dev -m CtsAppTestCases -t \
      android.app.cts.ActivityStartTimeTest

Change-Id: I396458ecefbb09108f414b95f9c0beb6d609a4e1
2017-04-14 14:19:25 -07:00
Romain Guy
908370bb27 Merge "Add BitmapFactory.Options.inColorSpace" into oc-dev am: c99bcc69f7
am: f713a1960e

Change-Id: Ie1d361e946cf68ba97352ef6946f9d82ed5b784b
2017-04-14 21:19:25 +00:00
Marc Hittinger
4affb1edf0 Merge "Add debug property to enable low_ram mode." 2017-04-14 21:19:09 +00:00
Phil Burk
1f99a3277b BluetoothMidi: request higher priority, for lower latency
Request a higher connection priority.
This will result in a Connection Interval below 15 msec
vs 45 msec for some devices.

Fix: 34710538
Test: Connect a BLE-MIDI device using the MIDI+BTLE test app. See bug.
Change-Id: I846a76a36c864f82969173a94d86b05059a786ad
Signed-off-by: Phil Burk <philburk@google.com>
2017-04-14 14:16:39 -07:00
Romain Guy
f713a1960e Merge "Add BitmapFactory.Options.inColorSpace" into oc-dev
am: c99bcc69f7

Change-Id: I016c2b265dc471b74cd703281b3de60d7e54bfea
2017-04-14 21:14:10 +00:00
Romain Guy
e9cbbea820 Merge "Clarify doc for Bitmap.createBitmap()" into oc-dev am: 1eaab2db82
am: fd715c7fbe

Change-Id: I1b97afca9c46a6e2c1c33a9f68da49e43c039b46
2017-04-14 21:10:00 +00:00
Jason Monk
77857df729 Merge "Convert signal icon to be custom drawable" into oc-dev am: 06426bf652
am: 389755704e

Change-Id: Idce35feb4c53e68970a289b4e811b2a2e9b09d01
2017-04-14 21:08:45 +00:00
Romain Guy
c99bcc69f7 Merge "Add BitmapFactory.Options.inColorSpace" into oc-dev 2017-04-14 21:08:42 +00:00
Romain Guy
fd715c7fbe Merge "Clarify doc for Bitmap.createBitmap()" into oc-dev
am: 1eaab2db82

Change-Id: I2b843c5f94460f5ee7d9a7767d0411fe6c117a3c
2017-04-14 21:05:55 +00:00
Jason Monk
389755704e Merge "Convert signal icon to be custom drawable" into oc-dev
am: 06426bf652

Change-Id: I3fddf788317b91e65c22ec75bb3e6aa0509f64fe
2017-04-14 20:58:31 +00:00
Romain Guy
c6866a988a Merge "Fix API feedback on Color" into oc-dev am: 03758701fb
am: 7700c2b238

Change-Id: I64f6dcabfd1722475947be3b3e3cc636b724dbed
2017-04-14 20:57:07 +00:00
Mady Mellor
f9eb4e8716 Merge "Fix issue where menu items visible on 'closed' notification on lockscreen" into oc-dev am: 4b7b01c1cc
am: daf76b82ae

Change-Id: Ia7b9f62d9040a98193e0ed79a259e0741538f494
2017-04-14 20:54:56 +00:00
TreeHugger Robot
1eaab2db82 Merge "Clarify doc for Bitmap.createBitmap()" into oc-dev 2017-04-14 20:53:26 +00:00
Romain Guy
7700c2b238 Merge "Fix API feedback on Color" into oc-dev
am: 03758701fb

Change-Id: I5b3d30552adedc603a97b65b1f739c19142e70b2
2017-04-14 20:49:20 +00:00
Mady Mellor
daf76b82ae Merge "Fix issue where menu items visible on 'closed' notification on lockscreen" into oc-dev
am: 4b7b01c1cc

Change-Id: Ib51c0125042553302584c79a360ee07f2ae1c1b8
2017-04-14 20:48:02 +00:00
Yohei Yukawa
d91860d9ce Support flagNoPersonalizedLearning in layout XML
In my previous CL [1] a new flag IME_FLAG_NO_PERSONALIZED_LEARNING
was added for EditorInfo.imeOptions.  What was missed in the
previous CL is that new flag definition for layout XML and as a
result currently IME_FLAG_NO_PERSONALIZED_LEARNING is the only
IME option flag that cannot be specified in layout XML.

For instance, EditorInfo.IME_FLAG_FORCE_ASCII can be specified as
follows.

 <EditText
     android:id="@+id/edittext_force_ascii"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:imeOptions="actionSend|flagForceAscii" />

With this CL, application developers can specify
IME_FLAG_NO_PERSONALIZED_LEARNING as follows.

 <EditText
     android:id="@+id/edittext_no_personalized_learning"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:imeOptions="actionSend|flagNoPersonalizedLearning" />

 [1]: Ibf5ac3d2b8f39542baf2635c0cadbe242b059f81
      5959af13d069e77ff2b2ac729225e7d248b83a79

Bug: 28157942
Fixes: 37305520
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Change-Id: Ifca0b13bf336cdc609af820aadcdb1b45ca1d5ba
2017-04-14 13:46:37 -07:00
TreeHugger Robot
06426bf652 Merge "Convert signal icon to be custom drawable" into oc-dev 2017-04-14 20:44:19 +00:00
TreeHugger Robot
03758701fb Merge "Fix API feedback on Color" into oc-dev 2017-04-14 20:42:19 +00:00
Hangyu Kuang
5ba5e9182c media: Address API review comments
Change setNextOutputFile to accept File instead of String. Also add new version
of setOutputFile to accept File.

Bug: 36791064
Test: CTS test.
Change-Id: I1a3d574e7cf36acbf181407131bc9dbf114d30de
2017-04-14 13:41:01 -07:00
Mady Mellor
4b7b01c1cc Merge "Fix issue where menu items visible on 'closed' notification on lockscreen" into oc-dev 2017-04-14 20:40:03 +00:00
Nathan Harold
cd9d4b1491 Merge changes from topic 'ipsec-api-tweaks-merge' into oc-dev am: 9361283073
am: 3ce4d95d22

Change-Id: Ib34939764f9f347ad245c3497d36ed61c093e8eb
2017-04-14 20:35:47 +00:00
Wale Ogunwale
5e8ecb0f34 Reduce effect on PipMenuActivity during animation
- Set windowDisablePreview to true so no starting window is added for
the pip menu activity.
- setDisablePreviewScreenshots() so we don't waste time taking
screenshot for the pip menu activity.

Test: manual
Change-Id: I327603b9b0edc0baff779b00c8f6f035852aad15
2017-04-14 13:32:19 -07:00
Nathan Harold
3ce4d95d22 Merge changes from topic 'ipsec-api-tweaks-merge' into oc-dev
am: 9361283073

Change-Id: I4ca6b6293dabe856098dda98ce6ca804fa419b44
2017-04-14 20:28:56 +00:00
Nathan Harold
9361283073 Merge changes from topic 'ipsec-api-tweaks-merge' into oc-dev
* changes:
  Add FileDescriptor Versions of applyTransportModeTransform()
  IpSecManager and IpSecAlgorithm API Tweaks
2017-04-14 20:21:17 +00:00
Andrew Zeng
4caeaa4449 Merge "Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am: 2c42db20e4 -s ours am: 812594f573 am: 45bd03914c -s ours" into oc-dev-plus-aosp
am: 7750ab39b2

Change-Id: Id41aad8e09009a52be5731de1679d154757c935f
2017-04-14 20:18:39 +00:00
Andrew Zeng
a4b3107ba7 Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am: 2c42db20e4 -s ours am: 812594f573 -s ours am: d210ce63d0
am: 1ba83de49e

Change-Id: I3d173b0b3c01129ba44118d749369c535e783bde
2017-04-14 20:13:42 +00:00
Nathan Harold
04908fcd17 Update doc string for getForbiddenPlmns() to READ_PHONE_STATE
For whatever reason when I chose the permission for this API I
chose the internal READ_PRIVILEGED_PHONE_STATE. Updating this to
use the equivalent public permission (since this is a public API)
requires me to use READ_PHONE_STATE

Bug: 35261110
Test: docstring only change. Compilation
Change-Id: I3647271798b33040751905c13b20da727eacfd9b
2017-04-14 13:13:11 -07:00
Android Build Merger (Role)
7750ab39b2 Merge "Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am: 2c42db20e4 -s ours am: 812594f573 am: 45bd03914c -s ours" into oc-dev-plus-aosp 2017-04-14 20:11:00 +00:00
Andrew Zeng
1834250bbe Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am: 2c42db20e4 -s ours am: 812594f573
am: 45bd03914c  -s ours

Change-Id: Iadf1027f7bc9d9bc31264341cb6797ae241882fd
2017-04-14 20:09:46 +00:00
Andrew Zeng
1ba83de49e Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am: 2c42db20e4 -s ours am: 812594f573 -s ours
am: d210ce63d0

Change-Id: Ic2932b7fd206c72de0fe78fd604effd8603cc8e7
2017-04-14 20:08:35 +00:00
Rebecca Silberstein
24f9dcb9e5 Add a default SSID prefix for local only hotspot
Add a default prefix for local only hotspot that will be used to
generate WifiConfiguration objects.  This prefix will have
random digits appended to reduce AP name collisions.

Bug: 36704909
Test: compiles

Change-Id: I2b9478a12de27cabe13ece2973bce7cd4976ba2f
Merged-In: I2b9478a12de27cabe13ece2973bce7cd4976ba2f
2017-04-14 13:04:15 -07:00
Andrew Zeng
d210ce63d0 Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am: 2c42db20e4 -s ours
am: 812594f573  -s ours

Change-Id: I54ee864eadfe657ab560c6490a23227532d96b0c
2017-04-14 20:03:20 +00:00
Andrew Zeng
45bd03914c Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am: 2c42db20e4 -s ours
am: 812594f573

Change-Id: Ifb03ad1b13aa59e18ff658f6a0a5779d42d1d226
2017-04-14 20:02:57 +00:00
Andrew Zeng
812594f573 Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev
am: 2c42db20e4  -s ours

Change-Id: I1c4ddbf044df414cffa282d9e9aba4261b23a975
2017-04-14 19:52:58 +00:00
Philip P. Moltmann
e048a65639 Fix some racines in AutofillManager
- The session might be gone by the time the handler is called, hence check
  the sessionID
- Access getClientLocked() and mSession only under mLock.

Test: cts-tradefed run cts-dev AutoFillServiceTestsCases
Change-Id: I445a24557589afadb1f5372b63ef9db88021b609
2017-04-14 12:50:03 -07:00
Andrew Zeng
2c42db20e4 Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev 2017-04-14 19:40:57 +00:00
Adrian Roos
8c4a48f389 Merge "Sysui Leaks: Leak check destroyed fragments" into oc-dev am: b160141698
am: a1da551856

Change-Id: I15b1d29ae469449c3861c2b743cf4b28e777108a
2017-04-14 19:40:20 +00:00