Dianne Hackborn
a1842e0b28
am 0f5a222d: Merge "Change wake reason checkin tag to "wr"."
...
* commit '0f5a222dabb943b5161fdbd0f1f4af4b9172c89f':
Change wake reason checkin tag to "wr".
2014-05-02 21:13:18 +00:00
Dianne Hackborn
f589f2a190
Merge "Change wake reason checkin tag to "wr"."
2014-05-02 21:08:53 +00:00
Amith Yamasani
dc2d29602f
am f926cb22: Merge "Send ACTION_MANAGED_PROFILE_REMOVED broadcast."
...
* commit 'f926cb222d532f09ca42f52fd5936326c8823a7e':
Send ACTION_MANAGED_PROFILE_REMOVED broadcast.
2014-05-02 21:03:12 +00:00
Selim Gurun
16616b5706
am 63e690cc: Merge "Design a static API for clearclientcertpreferences"
...
* commit '63e690ccddb62609c2066a10f580a2f55516b08d':
Design a static API for clearclientcertpreferences
2014-05-02 20:59:20 +00:00
Amith Yamasani
d23eb5ceb6
Merge "Send ACTION_MANAGED_PROFILE_REMOVED broadcast."
2014-05-02 20:58:55 +00:00
Selim Gurun
c25f243a50
Merge "Design a static API for clearclientcertpreferences"
2014-05-02 20:56:44 +00:00
Dianne Hackborn
d06dcfd3db
Change wake reason checkin tag to "wr".
...
The old "Wr" was also used for Wifi Running.
Also include discharge/charge time remaining in
checkin output.
Change-Id: I303a0be902002d0399b9eb76773857da9103e8ce
2014-05-02 13:54:13 -07:00
Adam Connors
7b66ed5885
Send ACTION_MANAGED_PROFILE_REMOVED broadcast.
...
When the managed profile is removed, this new intent
is used to inform the rest of the system.
Change-Id: I1748bed0a7ee0122f69d5c78235a79f8e205efec
2014-05-02 13:54:05 -07:00
John Reck
3a11dbaa41
am 91058957: Merge "Add CanvasProperty for drawCircle"
...
* commit '91058957b673bee84d1f7694309c2b33a17a48ac':
Add CanvasProperty for drawCircle
2014-05-02 20:51:11 +00:00
John Reck
0e82d134ee
Merge "Add CanvasProperty for drawCircle"
2014-05-02 20:48:26 +00:00
John Reck
52244fff29
Add CanvasProperty for drawCircle
...
Change-Id: Icbcc030f5033d2094e567d7c519b9d672f2aac1c
2014-05-02 13:43:46 -07:00
Dianne Hackborn
b6459d45f3
am 9fb69d21: Fix issue #14492403 : Oom scores appear to be incorrect...
...
* commit '9fb69d2129e350b243e70816707c26729dbd7daa':
Fix issue #14492403 : Oom scores appear to be incorrect...
2014-05-02 20:42:28 +00:00
Dianne Hackborn
5d84bce122
Fix issue #14492403 : Oom scores appear to be incorrect...
...
...and causing runtime restarts
Got a little too aggressive with the delete key. *blush*
Change-Id: Icd4637827424211abc2347f7f9407c2d4c95cfad
2014-05-02 13:21:16 -07:00
Dianne Hackborn
ed433f5b88
am 89094f50: Merge "Make GET_TASKS signature|system."
...
* commit '89094f504091775d1f7ff68cf9cde11c87d2417a':
Make GET_TASKS signature|system.
2014-05-02 20:21:00 +00:00
Dianne Hackborn
5b8b920022
Merge "Make GET_TASKS signature|system."
2014-05-02 20:18:10 +00:00
RoboErik
1ae4c50af7
am 3ce0a7e8: Merge "Add playback state and metadata to dump"
...
* commit '3ce0a7e830b780cda47eb4e6cacf64d260cb273e':
Add playback state and metadata to dump
2014-05-02 20:10:06 +00:00
Selim Gurun
e1c6c3ae21
Design a static API for clearclientcertpreferences
...
Bug: 12983007
Change-Id: I869b4cd4c178b8fedf725f108fd2e369895543e9
2014-05-02 13:08:55 -07:00
RoboErik
4f854e0d0b
Merge "Add playback state and metadata to dump"
2014-05-02 20:07:07 +00:00
Adam Powell
48880767b1
am 298eed05: Merge "Fix a bug in querying showing state for action bars"
...
* commit '298eed05ff178486433421de31b6a4e9822c9928':
Fix a bug in querying showing state for action bars
2014-05-02 20:06:05 +00:00
Jorim Jaggi
341cff8155
am 61700e82: Merge "Fix padding for SIM pin entry."
...
* commit '61700e8200781b89eb99747c52c7661d70be2bd2':
Fix padding for SIM pin entry.
2014-05-02 20:06:01 +00:00
Jorim Jaggi
f29d07cf82
am bf4ddbac: Merge "Filter touch events in ExpandableView."
...
* commit 'bf4ddbacc92f934193442dcf7c53f413533c3002':
Filter touch events in ExpandableView.
2014-05-02 20:05:58 +00:00
Adam Powell
9529d8f26f
Merge "Fix a bug in querying showing state for action bars"
2014-05-02 20:04:01 +00:00
Jorim Jaggi
774d4a6c78
Merge "Fix padding for SIM pin entry."
2014-05-02 20:03:54 +00:00
Jorim Jaggi
9acfb48f6e
Merge "Filter touch events in ExpandableView."
2014-05-02 20:03:43 +00:00
Adam Powell
c4b416f18d
Fix a bug in querying showing state for action bars
...
Bug 14492418
Change-Id: I8d24fd90a8d4004ace186f5ce84ba68fc8419307
2014-05-02 12:55:24 -07:00
Jorim Jaggi
412cc7049f
Fix padding for SIM pin entry.
...
Bug: 14224920
Change-Id: Icd8bf48a5946adeef9bfc6b00e4522c7fa3e56c3
2014-05-02 21:10:13 +02:00
Scott Main
900699756e
am 52aef01c: am 76df9c34: am db94d2d1: am 1d7ea94d: am 937db487: Merge "update dashboard for 5/1/14" into klp-docs
...
* commit '52aef01c4fae0881a251e8500a476b6d3dcc5df9':
update dashboard for 5/1/14
2014-05-02 18:58:08 +00:00
Scott Main
abc975f539
am 76df9c34: am db94d2d1: am 1d7ea94d: am 937db487: Merge "update dashboard for 5/1/14" into klp-docs
...
* commit '76df9c3485526fd99de031d9bc7df7e24e4641cf':
update dashboard for 5/1/14
2014-05-02 18:52:18 +00:00
Dianne Hackborn
0923328962
Make GET_TASKS signature|system.
...
Normal apps can't hold it now. If they try to use
getRecentTasks() or getRunningTasks() without the permission,
they will only see their own tasks and home in the list.
Also took this opportunity to eradicate all of the old pending
thumbnail stuff.
Change-Id: I6dc52a06221c78097162e4a8b482027b798bf3ee
2014-05-02 11:51:26 -07:00
Zhijun He
7db103bb2d
am 7c358ce4: Merge "Camera2: replace AssertionError with error log"
...
* commit '7c358ce4a1961612ed5f644ec8827010db545dec':
Camera2: replace AssertionError with error log
2014-05-02 18:50:07 +00:00
Scott Main
76df9c3485
am db94d2d1: am 1d7ea94d: am 937db487: Merge "update dashboard for 5/1/14" into klp-docs
...
* commit 'db94d2d1e5fe1a357f53357429e4035bc08ee5d0':
update dashboard for 5/1/14
2014-05-02 18:48:07 +00:00
Zhijun He
25bb60e844
Merge "Camera2: replace AssertionError with error log"
2014-05-02 18:45:06 +00:00
Scott Main
db94d2d1e5
am 1d7ea94d: am 937db487: Merge "update dashboard for 5/1/14" into klp-docs
...
* commit '1d7ea94d72808162e70e55a531563cb011ac6f30':
update dashboard for 5/1/14
2014-05-02 18:44:43 +00:00
Scott Main
1d7ea94d72
am 937db487: Merge "update dashboard for 5/1/14" into klp-docs
...
* commit '937db487443171b75f321190be591c8f3d5f74bb':
update dashboard for 5/1/14
2014-05-02 18:40:33 +00:00
Scott Main
937db48744
Merge "update dashboard for 5/1/14" into klp-docs
2014-05-02 18:36:42 +00:00
Scott Main
1e976bd1ac
am 7d9d1c04: am 7cb2bf1b: am 3525b3c7: am 44e7ed77: am 5584601c: add intel USB vendor ID bug: 13982556
...
* commit '7d9d1c04cc0ee0e1220c349053282392fc6701c5':
add intel USB vendor ID bug: 13982556
2014-05-02 18:27:09 +00:00
Scott Main
201a24f652
am 7cb2bf1b: am 3525b3c7: am 44e7ed77: am 5584601c: add intel USB vendor ID bug: 13982556
...
* commit '7cb2bf1bf3d6ecb9c0a104c3cbc6486b5ffd8652':
add intel USB vendor ID bug: 13982556
2014-05-02 18:21:05 +00:00
Scott Main
7cb2bf1bf3
am 3525b3c7: am 44e7ed77: am 5584601c: add intel USB vendor ID bug: 13982556
...
* commit '3525b3c7e9d7d4fd2c60d88f6e3b92c30ec68558':
add intel USB vendor ID bug: 13982556
2014-05-02 18:18:34 +00:00
Scott Main
3525b3c7e9
am 44e7ed77: am 5584601c: add intel USB vendor ID bug: 13982556
...
* commit '44e7ed77f16f6773d950e8b7a4fadb526b4c7a8a':
add intel USB vendor ID bug: 13982556
2014-05-02 18:13:11 +00:00
Scott Main
44e7ed77f1
am 5584601c: add intel USB vendor ID bug: 13982556
...
* commit '5584601c8ade068f403808a3c2b5e9c611134ab2':
add intel USB vendor ID bug: 13982556
2014-05-02 18:10:30 +00:00
Lajos Molnar
e1ab072cab
am cba1bcc6: Merge "MediaHTTPConnection: support header android-allow-cross-domain-redirect"
...
* commit 'cba1bcc60f47af9007d23c141317f5d2880a09e6':
MediaHTTPConnection: support header android-allow-cross-domain-redirect
2014-05-02 18:09:17 +00:00
Lajos Molnar
74b3cda9e0
Merge "MediaHTTPConnection: support header android-allow-cross-domain-redirect"
2014-05-02 18:02:45 +00:00
Scott Main
5584601c8a
add intel USB vendor ID
...
bug: 13982556
Change-Id: I34fae455f0eee04088bed3f79243776321c745cf
2014-05-02 10:50:50 -07:00
Justin Koh
ce3c998337
am 93671ef4: am 9abf0b90: am 60158445: Merge "Make global action key timeout configurable." into klp-modular-dev
...
* commit '93671ef4b14fabcd06eb64618dc82f6e609edaa2':
Make global action key timeout configurable.
2014-05-02 17:42:07 +00:00
Justin Koh
f46009225b
am 9abf0b90: am 60158445: Merge "Make global action key timeout configurable." into klp-modular-dev
...
* commit '9abf0b9031d0ddc33970589d2fb88065d15de712':
Make global action key timeout configurable.
2014-05-02 17:33:48 +00:00
Justin Koh
9abf0b9031
am 60158445: Merge "Make global action key timeout configurable." into klp-modular-dev
...
* commit '6015844578dc4d725c7ab3d3004d18ffea446087':
Make global action key timeout configurable.
2014-05-02 17:28:53 +00:00
Justin Koh
6015844578
Merge "Make global action key timeout configurable." into klp-modular-dev
2014-05-02 17:25:50 +00:00
Justin Koh
feabd2c730
Make global action key timeout configurable.
...
Make global action key timeout configurable: deprecated the old public method
and created a new one: getDeviceGlobalActionKeyTimeout.
Bug: 14441321
Change-Id: Ifa9b136984a9f02cfe4040baeff11275174967c5
2014-05-02 10:04:34 -07:00
Mark Renouf
ef78c873b0
am 8302a4d9: am 63f72806: am 11b14691: Implement cliff guard for swipeDismiss gesture
...
* commit '8302a4d960ee2f4f22d9816f12218761d26f0707':
Implement cliff guard for swipeDismiss gesture
2014-05-02 16:59:11 +00:00
Matthew Williams
f686bfa68a
am b283ac25: Merge "Fix sdk build by removing javadoc link"
...
* commit 'b283ac25cbaf228dc8fdcde74e5c44e5db2af0da':
Fix sdk build by removing javadoc link
2014-05-02 16:54:57 +00:00