Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
254,866 Commits 3 Branches 0 Tags
88de13a8d44697cf8934978bb9ba3520a1def1da
Commit Graph

65700 Commits

Author SHA1 Message Date
Tianjie Xu
3aeade44a9 Merge "Log the error when uncrypt timeouts" am: c1973ecbd2 
am: c68e6d6708

Change-Id: I23ee644fb2f73fc3cece4faf59eb63417cfe3ea6
 2016-09-28 19:59:12 +00:00
Tianjie Xu
c68e6d6708 Merge "Log the error when uncrypt timeouts" 
am: c1973ecbd2

Change-Id: I5bec3110f9a46cbc1f44bc07d86eea409667983e
 2016-09-28 19:53:37 +00:00
Treehugger Robot
c1973ecbd2 Merge "Log the error when uncrypt timeouts" 2016-09-28 19:42:29 +00:00
Andreas Huber
0f7eb16fad Merge "Adds static methods HwBlob.WrapArray(<scalar-type>[] scalarArray)" am: 90acbd86ac 
am: 2849ee8b75

Change-Id: I00d47819095dd8b52dae52f3d55d6b3bc9998aaf
 2016-09-28 17:36:31 +00:00
Andreas Huber
2849ee8b75 Merge "Adds static methods HwBlob.WrapArray(<scalar-type>[] scalarArray)" 
am: 90acbd86ac

Change-Id: Ia3013237296ccca46e3f4e0bc702b4ae90a7ea3a
 2016-09-28 17:30:23 +00:00
Tianjie Xu
036d08638e Log the error when uncrypt timeouts 
Log the error code to uncrypt_status if uncrypt gets killed because
of timeout.

Test: We log the error code correctly in uncrypt_status when uncrypt timeouts.
Bug: 31603820
Change-Id: Ia623c333714295e68f4269257fbb4297a867e42b
 2016-09-27 13:34:58 -07:00
Andreas Huber
906a679aa8 Adds static methods HwBlob.WrapArray(<scalar-type>[] scalarArray) 
that convert a one-dimensional array of scalars into the corresponding
one-dimensional array of the associated "wrapped" type, i.e. byte[] -> Byte[].

Change-Id: I712b2bb5330bd660816d0ff536a55913904203b6
Bug: 31682327
Test: hidl_test_java
 2016-09-27 11:20:44 -07:00
Kevin Hufnagle
3b0cfd76c2 docs: Added min/max values and descriptions for alpha getter/setter in ImageView 
am: bdb308a059

Change-Id: I320c5aa446eed60083c648f596a84a165596cd60
 2016-09-26 23:36:36 +00:00
Kevin Hufnagle
ba65a92855 docs: Added note in getCacheDir() that developers can use directory obtained from getExternalCacheDir() to store app caches larger than 1 MB. 
am: e9681e192a

Change-Id: I4d84c62b039746cd70c74a0bc9edbffc6df3a44c
 2016-09-26 23:35:11 +00:00
Kevin Hufnagle
e0360165d3 docs: Removed all instances of "i.e." in IntentFilter parameter descriptions. 
am: e20b3d78e3

Change-Id: I37821ca96243491cf642a58475dd96e5e7b52962
 2016-09-26 23:33:43 +00:00
Kevin Hufnagle
1456a0a321 docs: Added note in LayoutTransition class reference that APPEARING and DISAPPEARING animation timelines cannot overlap 
am: 5232329b4e

Change-Id: I3e037099a06ca628691c111e065f0c54bc10cb66
 2016-09-26 23:13:26 +00:00
Kevin Hufnagle
f3f234ff36 docs: Clarified definition of KeyEvent.Callback.onKeyMultiple() 
am: b248b1f689

Change-Id: I9f1c7377e09fc6a7831ab3e49784c21c4a3cf873
 2016-09-26 23:10:26 +00:00
Kevin Hufnagle
108623004f docs: Fixed example of ACTION_VIEW intent 
am: aedfd75b1b

Change-Id: I2ac1bd94b7cacc2b1aaed6caf2f7044db5a892c6
 2016-09-26 22:59:37 +00:00
Kevin Hufnagle
1fb3dec4be docs: Adjusted return value desc. for getApplicationEnabledSetting 
am: 5add769f59

Change-Id: Ibffca6373a01e74bc25a4f44afbc7c4463810124
 2016-09-26 22:46:08 +00:00
Mark Lu
195099dc32 docs: improve docs for sqlite package summary 
am: 59640a9f1c

Change-Id: I9ec1851274071cb1882839df68e27d1c9b98f8f7
 2016-09-26 17:24:06 +00:00
Mark Lu
5dc8052df6 docs: Update docs for SQLiteDatabase replace methods 
am: 1e20208d90

Change-Id: I8222fae7025d5a546b0b3d6b0ebbb7abae66ba8b
 2016-09-26 17:22:45 +00:00
Hemal Patel
9fa6e02d2d Fixed a typo in the code sample 
am: 247d1c9ea8

Change-Id: Ic07c17c95e29ce916e2cde22cbb0ce797f8c65fe
 2016-09-26 17:21:04 +00:00
Treehugger Robot
fe9357f6e7 Merge changes from topic 'aosp-generics-api' 
* changes:
  DO NOT MERGE Track generics in API definition.
  DO NOT MERGE Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API
 2016-09-26 14:04:57 +00:00
Kevin Hufnagle
e9681e192a docs: Added note in getCacheDir() that developers can use directory 
obtained from getExternalCacheDir() to store app caches larger than
1 MB.

Bug: 22505268
Change-Id: I9972ba5ef7b43a135c00ac48a2e5ccb1fcc5b103
 2016-09-23 16:44:03 -07:00
Kevin Hufnagle
bdb308a059 docs: Added min/max values and descriptions for alpha getter/setter 
in ImageView

Bug: 12644483
Change-Id: I269d63b50412ecea5269acb99fc09c8110e404b4
 2016-09-23 15:54:42 -07:00
Mark Lu
56be5c1ae0 docs: update javadoc description for View.setVisibility() method 
am: ae0459f532

Change-Id: I3c9d70fc6fc2b6770076454cdfbb1ed1b619dfb9
 2016-09-23 22:18:35 +00:00
Mark Lu
5080a2c5e1 docs: Add param info to TextView.setTextColor 
am: 193879a8b6

Change-Id: I8c903627670c946bd421b3e77bbd2a372f21adf0
 2016-09-23 22:15:10 +00:00
Mark Lu
d91c303e6c Merge "docs: update javadoc description for View.setVisibility() method" into nyc-dev 2016-09-23 22:10:39 +00:00
Mark Lu
7df8927691 Merge "docs: Add param info to TextView.setTextColor" into nyc-dev 2016-09-23 22:09:34 +00:00
Mark Lu
cc9f8e2418 docs: Mention SwitchCompat in Switch and toggle documentation 
am: 3404032dfc

Change-Id: Ia8aaadb4656a0fcb631ef9608f01afde4a00c4aa
 2016-09-23 21:52:30 +00:00
Mark Lu
c6a1076e40 Merge "docs: Mention SwitchCompat in Switch and toggle documentation" into nyc-dev 2016-09-23 21:47:31 +00:00
Gopal Krishna Shukla
621e87d72f Merge "Provide synchronization to setview to avoid NPE" am: b05b93a674 
am: 810c31fdca

Change-Id: Ibd664e4836eaceef8a4d8363793667afa757387a
 2016-09-23 13:11:23 +00:00
Gopal Krishna Shukla
810c31fdca Merge "Provide synchronization to setview to avoid NPE" 
am: b05b93a674

Change-Id: I92bec8af349cae5232e65d88938635a93f06fc6a
 2016-09-23 13:07:52 +00:00
Kevin Hufnagle
e20b3d78e3 docs: Removed all instances of "i.e." in IntentFilter parameter 
descriptions.

Bug: 5877117
Change-Id: Iccb16589a72d3180330f13ec224578a0c5ad81c6
 2016-09-22 18:33:57 -07:00
Gopal Krishna Shukla
f7abcda5f2 Provide synchronization to setview to avoid NPE 
If setView() will be called from two different threads
then mView property of a View object may have inconsistent
value. For instance, setView() may set mView to null causing
NullPointerException. Synchronize root.setView() as well to
avoid this.

Change-Id: I5f9cf47ece5d4aca575bd8644ecfcee0ed43d843
 2016-09-22 04:48:24 +00:00
Chris Tate
2cc80a362a Merge "Fix WallpaperManager APIs" am: 73e89cd290 
am: 6e1400f43f

Change-Id: I1b220d887daefe160472fb41959a03eb20e1b98e
 2016-09-21 20:39:56 +00:00
Chris Tate
6e1400f43f Merge "Fix WallpaperManager APIs" 
am: 73e89cd290

Change-Id: I6dd139e8ccb71e6c64141733f9de031b20694179
 2016-09-21 20:34:49 +00:00
Chris Tate
73e89cd290 Merge "Fix WallpaperManager APIs" 2016-09-21 20:26:01 +00:00
Marie Janssen
dbb8ffc47d Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f am: 3106e3ae27 am: e3812fc048 am: 532d2b11a3 
am: 6f514cc82b

Change-Id: I88928de86c08a148b3124c616b309862da1a1c24
 2016-09-21 01:59:29 +00:00
Marie Janssen
6f514cc82b Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f am: 3106e3ae27 am: e3812fc048 
am: 532d2b11a3

Change-Id: Iee468d3bcfd72b33475e9bf1d51865f3c5e8a4a2
 2016-09-21 01:02:29 +00:00
Marie Janssen
532d2b11a3 Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f am: 3106e3ae27 
am: e3812fc048

Change-Id: I6119aa9db2792a149202c16d63de205ba32423e8
 2016-09-21 00:46:01 +00:00
Marie Janssen
e3812fc048 Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f 
am: 3106e3ae27

Change-Id: I0748eed7b884294d993b4538e4e65397b6f0dbb2
 2016-09-21 00:37:07 +00:00
Marie Janssen
3106e3ae27 Fix setPairingConfirmation permissions issue (2/2) 
am: 93326cfd9f

Change-Id: If8fdb8c3f5c167e1b6465c67cf64b8310d55b80b
 2016-09-21 00:19:12 +00:00
Christopher Wiley
c185893e9c Merge "Allow WiFi components to manage interface up state" am: dfa6e6f186 
am: b666aa899d

Change-Id: Ie58b51e7e0f04648d15b48beaf0883108dea649b
 2016-09-20 21:47:10 +00:00
Christopher Wiley
b666aa899d Merge "Allow WiFi components to manage interface up state" 
am: dfa6e6f186

Change-Id: If2bdb1b6671465daffa8c0161f52c8693146a816
 2016-09-20 21:41:03 +00:00
Treehugger Robot
dfa6e6f186 Merge "Allow WiFi components to manage interface up state" 2016-09-20 21:27:54 +00:00
Andreas Huber
60c722812c Merge "Removed legacy code used to read/write java arrays from HwBinder parcels." am: eda7bc5c84 
am: 618e39a3be

Change-Id: If1d020f2d62980992ce82359922c1ebfde4c19f8
 2016-09-20 20:59:31 +00:00
Andreas Huber
618e39a3be Merge "Removed legacy code used to read/write java arrays from HwBinder parcels." 
am: eda7bc5c84

Change-Id: If256977b368ec830f1c01f86c3845d9313c38767
 2016-09-20 20:48:53 +00:00
Treehugger Robot
eda7bc5c84 Merge "Removed legacy code used to read/write java arrays from HwBinder parcels." 2016-09-20 20:28:12 +00:00
Dianne Hackborn
3da7e4e563 A little more on issue #30766518: Document what targeting N does 
am: da6be5b871

Change-Id: Ie1fdb2b07ff8fa016a82a1405336db0dac119fef
 2016-09-20 17:07:15 +00:00
Dianne Hackborn
bae14052a0 Cherrypick so we can publish N version code description ASAP 
am: 491bc2b8d6

Change-Id: I27da25afcaca61ac0159699c0cfc8fbf2338aa2c
 2016-09-20 17:05:09 +00:00
Christopher Wiley
ce5d913387 Allow WiFi components to manage interface up state 
Setting the WiFi network interface up or down is racy because it
is not synchronized with the WiFi components managing the interface.

This causes a problem for hostapd when the interface is marked down
before hostapd starts because it causes the driver to enter the
de-initialization process.  hostapd does not know how to react to this
change of events.

Bug: 31205821
Test: bug no longer reproduces on upcoming devices, unit tests pass

Change-Id: I96938e2aef89b400593d42ce1b0a6ccc2d2e5754
 2016-09-19 14:12:38 -07:00
Andreas Huber
74c3b8edfe Removed legacy code used to read/write java arrays from HwBinder parcels. 
More generalized functionality is now available through HwBlob.

Change-Id: Id6c713fb01af7593ea3ff8405f3a9e5325877412
Bug: 31438033
Test: run updated "hidl_test" and "hidl_test_java"
 2016-09-19 14:09:14 -07:00
Dianne Hackborn
da6be5b871 A little more on issue #30766518: Document what targeting N does 
(cherry picked from commit 5f1649e852)

Change-Id: Ieaad1f3ddfa7ef3444e3b513181555f87ecb8c3f
 2016-09-19 20:05:07 +00:00
Dianne Hackborn
491bc2b8d6 Cherrypick so we can publish N version code description ASAP 
Fix issue #30766518: Document what targeting N does

Also small documentation cleanup in a few other places.

(cherry picked from commit b34cbedb4e)

Change-Id: I9560b29faa4f2674277349272af8193122a1f95e
 2016-09-19 19:31:19 +00:00