drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
234,408 Commits 1 Branch 0 Tags
Commit Graph

234408 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
8326e38bf5 Merge "Fix crash from battery detail" into nyc-dev 2016-03-02 17:42:27 +00:00
Jason Monk
6cb901268e Fix crash from battery detail 
Bug: 27417780
Change-Id: Ia63dd78a4b7b75470b57c8262bbc836180274bf5
 2016-03-02 12:40:43 -05:00
Greg Kaiser
7d3a9e5259 Merge "SensorEventListener: Clarify documentation." into nyc-dev 2016-03-02 17:27:47 +00:00
Greg Kaiser
fa806c5031 Merge "doc: Fix syntax error in code example." into nyc-dev 2016-03-02 17:26:45 +00:00
Greg Kaiser
949b9ff1b1 Merge "docs: Mild fix to a sensors_overview code example" into nyc-dev 2016-03-02 17:15:52 +00:00
Keun-young Park
98e386f650 Merge "Revert "Revert "make isUiModeLocked, isNightModeLocked test api""" into nyc-dev 2016-03-02 17:12:42 +00:00
Geoff Mendal
a793284540 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-02 16:38:50 +00:00
Calin Juravle
3977f20d00 Merge "Simplify the error logs for profiles we can't open." into nyc-dev 2016-03-02 16:17:34 +00:00
Geoff Mendal
48a4eb1f81 Import translations. DO NOT MERGE 
Change-Id: I0b50c9fa731657538936e961e3c0fa1eaa594489
Auto-generated-cl: translation import
 2016-03-02 07:30:42 -08:00
Geoff Mendal
cc3cae5edf Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-02 15:26:07 +00:00
Geoff Mendal
6c9af03fce Import translations. DO NOT MERGE 
Change-Id: I5f64277ff355790a3babb97dfeb37ecc892dfa71
Auto-generated-cl: translation import
 2016-03-02 07:25:28 -08:00
Geoff Mendal
840d8f1446 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-02 15:22:28 +00:00
Geoff Mendal
1ddc11be55 Import translations. DO NOT MERGE 
Change-Id: Id4836eb0d7454cbb028a40032ecd229e4a4d90d3
Auto-generated-cl: translation import
 2016-03-02 07:20:37 -08:00
Geoff Mendal
a865d5f4bb Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-02 15:20:16 +00:00
Geoff Mendal
a302da37a7 Import translations. DO NOT MERGE 
Change-Id: If6f96f29b8c300b1edc27cf0725dfe3492465e7d
Auto-generated-cl: translation import
 2016-03-02 07:14:03 -08:00
Narayan Kamath
9d0aa47c65 Merge "Track libcore change 2729b8c4d26170." into nyc-dev 2016-03-02 14:25:39 +00:00
Narayan Kamath
94825a16e0 Track libcore change 2729b8c4d26170. 
test-current.txt was regenerated on nyc-dev.

bug: 27423298

(cherry picked from commit b16a96538aa735c6926a95250fde2eca4b8e38ad)

Change-Id: Ieba7afaff407a421d3c2430f243151857cb42f97
 2016-03-02 14:18:30 +00:00
Kenny Guy
153c30b747 Merge "Don't clear widget providers from stopped profiles." into nyc-dev 2016-03-02 14:16:19 +00:00
Deepanshu Gupta
1aeb31bdbb Merge "Add StubMethodAdapterTest" into nyc-dev 2016-03-02 13:32:18 +00:00
Deepanshu Gupta
a9de835c17 Add StubMethodAdapterTest 
This tests the bugfix in StubMethodAdapter made in the change with id
I098996e43e330e995d33f12df1c16355bbc02f0f (commit 491523d)

Change-Id: I1ac897a49071dd9558bdc6b8abec29df913a6047
 2016-03-02 13:30:31 +00:00
Geoff Mendal
7a0b6e5213 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-02 13:28:44 +00:00
Deepanshu Gupta
dbe8a0fe3b LayoutLib: Reference android's junit in intellij project. 
Prevents errors due to mismatch in junit version.

Change-Id: I2adf32efb16472aa5f5e51025b6bb75afc76a8b4
 2016-03-02 13:26:18 +00:00
Geoff Mendal
492ebd85a9 Import translations. DO NOT MERGE 
Change-Id: I290495e9a0b12c372f30904725ac1d5fad961042
Auto-generated-cl: translation import
 2016-03-02 08:25:51 -05:00
Nimrod Gileadi
c14893bf5a Merge "Close InputStream in BatteryStatsHelper" into nyc-dev 2016-03-02 09:17:21 +00:00
Tomasz Mikolajewski
0d26fdb6cd Merge "Fix DocumentUI's perf tests compile failure." into nyc-dev 2016-03-02 09:00:48 +00:00
Tomasz Mikolajewski
f4628336b2 Fix DocumentUI's perf tests compile failure. 
It compiled locally, but not on the APCT.

Bug: 27370274
Change-Id: I7f10f3bf5b370d8e92311febfdcae133148e1312
 2016-03-02 17:57:46 +09:00
Diego Perez
e6423ee0ed Merge "Fix layoutlib expand unit test" into nyc-dev 2016-03-02 08:57:26 +00:00
Erik Kline
24f7d5e655 Add 464xlat notification callback 
am: 8d6edc3270

* commit '8d6edc3270616b119645fbdf8752c0ea37de0731':
  Add 464xlat notification callback
 2016-03-02 08:37:06 +00:00
Lorenzo Colitti
1856df512f Merge changes Id78aab9c,I51096b18 into nyc-dev 
* changes:
  Speed up ConnectivityServiceTest.
  Make it easier to test code that uses WakeupMessage.
 2016-03-02 08:32:51 +00:00
Tomasz Mikolajewski
ed82931cae Merge "Add a missing include in DocumentsUI Android.mk." into nyc-dev 2016-03-02 08:06:04 +00:00
Tomasz Mikolajewski
04049407a8 Add a missing include in DocumentsUI Android.mk. 
Without it, perf tests were not built on APCT.

Bug: 27370274
Change-Id: Ie154526d240bb9d1b4cce6fc089d502bf808c366
 2016-03-02 17:03:47 +09:00
Lorenzo Colitti
bfecba2938 Speed up ConnectivityServiceTest. 
1. Override WakeupMessage with an implementation that uses
   sendEmptyMessageDelayed. This allows us to replace a
   6-second sleep with a 150ms wait.
2. Change waitFor()'s polling interval from 100ms to 50ms.

With these changes ConnectivityServiceTest goes from ~9s to ~3s.

Change-Id: Id78aab9cded90a5b17f09d7f437904e179808dd2
 2016-03-02 17:01:50 +09:00
Erik Kline
8d6edc3270 Add 464xlat notification callback 
Bug: 26238390
Bug: 26991160
Change-Id: I556e779c642d19cd8d26637dd98055157d005f77
 2016-03-02 16:50:46 +09:00
Tomasz Mikolajewski
621a71c342 Merge "Fix broken tests due to uninitialized roots." into nyc-dev 2016-03-02 06:12:29 +00:00
Tomasz Mikolajewski
cf057efaff Fix broken tests due to uninitialized roots. 
Change-Id: I014657cab86ffa17290ab8990f0adaa6f6451e15
 2016-03-02 14:40:43 +09:00
Sungsoo Lim
4a67d975e4 Merge "MediaBrowserService: Make SubscriptionCallback.onError be called" into nyc-dev 2016-03-02 05:40:01 +00:00
Tomasz Mikolajewski
1a06789959 Merge "Add scaffolds for performance tests of DocumentsUI" into nyc-dev 2016-03-02 05:35:04 +00:00
Lorenzo Colitti
e7636e4750 Make it easier to test code that uses WakeupMessage. 
Code that uses WakeupMessage uses the AlarmManager. Testing such
code is slow because AlarmManager.MIN_FUTURITY ensures that
alarms must wait at least 5 seconds before firing.

This change makes WakeupMessage's fields protected so that test
code can subclass from it and override schedule() and cancel()
with implementations that do not use AlarmManager, for example
by making schedule() call sendEmptyMessageDelayed and making
cancel() call removeMessages.

Change-Id: I51096b182d9eb87cc7bd46c3c91906f18356b354
 2016-03-02 14:15:04 +09:00
Sungsoo Lim
64f16f1dc1 MediaBrowserService: Make SubscriptionCallback.onError be called 
Bug: 26733259
Change-Id: I8324e1c56e87071e781550ac0701e632a4122e73
 2016-03-02 14:08:18 +09:00
Wale Ogunwale
5b30f0df3f Merge "Enable add/remove window manager log points" into nyc-dev 2016-03-02 04:46:53 +00:00
Wale Ogunwale
3102c87a74 Enable add/remove window manager log points 
To debug 27286867.

Bug: 27286867
Change-Id: Iab5e608f8437ee0e315bfa3d091980f4a9e3a3b5
 2016-03-01 20:42:53 -08:00
Hyunyoung Song
c17fefe264 Merge "Update wallpaper asset for N dev preview Bug: 27434845" into nyc-dev 2016-03-02 04:40:49 +00:00
Hyunyoung Song
d9f91827a9 Update wallpaper asset for N dev preview 
Bug: 27434845

Change-Id: I0f9ff168beab12d630ab824ab632f98051564570
 2016-03-01 20:39:03 -08:00
Lorenzo Colitti
b7ffb76437 Merge changes Ic366b532,I0179b45b into nyc-dev 
* changes:
  Move PinningNetworkCallback out to a new NetworkPinner class.
  Use MessageUtils in ConnectivityManager.
 2016-03-02 04:18:03 +00:00
Tomasz Mikolajewski
ae6d6b494c Add scaffolds for performance tests of DocumentsUI 
Bug: 27370274
Change-Id: I14dea1b85cd84c8bb3c0eee27b2954108bfa4f8b
 2016-03-02 13:01:11 +09:00
Lorenzo Colitti
531a344300 Move PinningNetworkCallback out to a new NetworkPinner class. 
Also add tests.

Bug: 19159232
Change-Id: Ic366b53259ee5944a8e864876425a6558c0a7216
 2016-03-02 12:50:35 +09:00
Bryce Lee
aa8a5cd9bb DO NOT MERGE ANYWHERE Add way to query for supported Bluetooth profiles. am: 7c2539e2a5 -s ours 
am: 21c47d1b22  -s ours

* commit '21c47d1b22cfa317d7925b01de1c13cc2a39b3d6':
  DO NOT MERGE ANYWHERE Add way to query for supported Bluetooth profiles.
 2016-03-02 03:21:35 +00:00
Jeff Sharkey
5ca0b3462d Merge "When system server goes down, crash admins." into nyc-dev 2016-03-02 03:17:45 +00:00
Jeff Sharkey
dbff9ca4a5 When system server goes down, crash admins. 
Apps making calls into the system server may end up persisting
internal state or making security decisions based on the perceived
success or failure of a call, or the default values returned.

The reality is that if the system process just died, init will be
along shortly to kill all running apps, so we should have no problem
rethrowing the RemoteException as a RuntimeException.

Bug: 27364859
Change-Id: I866a8c3c9682da1de2a31fe8b4ffcc9d7f4d8ba0
 2016-03-01 20:15:40 -07:00
Bryce Lee
21c47d1b22 DO NOT MERGE ANYWHERE Add way to query for supported Bluetooth profiles. 
am: 7c2539e2a5  -s ours

* commit '7c2539e2a50ec3dcdb1c9420f9215bba438b21b6':
  DO NOT MERGE ANYWHERE Add way to query for supported Bluetooth profiles.
 2016-03-02 03:12:09 +00:00