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

185627 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zach Riggle
6a5b2110eb Merge "Fix NPE in FlashlightController" into lmp-dev 2015-03-19 23:09:33 +00:00
Dianne Hackborn
79ec42e6a3 Merge "First stab at device idle mode." 2015-03-19 23:05:16 +00:00
smain@google.com
62c595aaee am 6784cf99: am 092a7893: am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs 
* commit '6784cf9945e01de63f67ed11a4925fa9879f2073':
  add Places API to the Location feature page
 2015-03-19 22:55:38 +00:00
smain@google.com
6784cf9945 am 092a7893: am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs 
* commit '092a7893779455ca9d1a0ff34d9ccefb9ae709db':
  add Places API to the Location feature page
 2015-03-19 22:48:07 +00:00
smain@google.com
092a789377 am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs 
* commit 'd5fdc2870079876cd5d8407773aa73225a12c044':
  add Places API to the Location feature page
 2015-03-19 22:42:44 +00:00
smain@google.com
d5fdc28700 am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs 
* commit '3bc84b18b74cd14d98c81ea263b3ca49549a590c':
  add Places API to the Location feature page
 2015-03-19 22:35:16 +00:00
smain@google.com
3bc84b18b7 am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs 
* commit '910ca415587c6b7f7a004cc381c36352c021c12b':
  add Places API to the Location feature page
 2015-03-19 22:29:09 +00:00
Bo Liu
4dd12ef0c5 Merge "Remove debug logging from WebView" 2015-03-19 22:28:03 +00:00
smain@google.com
910ca41558 am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs 
* commit '4b53dc8bae0cc3f84e20765ea35ea3eab0371134':
  add Places API to the Location feature page
 2015-03-19 22:22:10 +00:00
smain@google.com
4b53dc8bae Merge "add Places API to the Location feature page" into lmp-docs 2015-03-19 22:16:12 +00:00
Chris Craik
14cfb6db33 Avoid throwing ISE in Canvas#restore underflow 
bug:19829784

Change-Id: I5829a7783ad912c09c83dee17bad10b90f42aace
 2015-03-19 15:11:38 -07:00
Paul Mclean
3756b40992 Merge "AudioService: fix crash when mediaserver killed" 2015-03-19 22:02:42 +00:00
Phil Burk
413d307c2c AudioService: fix crash when mediaserver killed 
Bug: 19847028
Change-Id: I4acacd8a6d20317d180a6994158abc0b2957280c
Signed-off-by: Phil Burk <philburk@google.com>
 2015-03-19 14:59:20 -07:00
Yang Ni
c6dbfececd am f2ea0171: am c077ee31: Merge "Added copyright notice and formatted to convention" 
* commit 'f2ea01717b918471b050bea46529e1843d36fc84':
  Added copyright notice and formatted to convention
 2015-03-19 21:47:31 +00:00
Yang Ni
f2ea01717b am c077ee31: Merge "Added copyright notice and formatted to convention" 
* commit 'c077ee316e0f6f50ade552f51ae657a08e423eaa':
  Added copyright notice and formatted to convention
 2015-03-19 21:41:59 +00:00
Yang Ni
8ff2980f31 New API methods for Script Group 
Use a single vararg Object array for both kernel/invoke arguments
and global bindings. The assumption is that global bindings are in
the end after the kernel/invoke arguments.
This simplifies the api to add a kernel or invoke to a script group.

Change-Id: I7efb1035c5967e2cadd15e6fe27f20c80ba197a2
 2015-03-19 14:38:20 -07:00
Bryce Lee
9fc0b6fb1f am b45d3926: am 8320cf2d: Merge "Fix wrong intent being passed in PhoneWindowManager." into lmp-mr1-modular-dev 
* commit 'b45d3926f327948c486c92ddc7fdb97dbc98e401':
  Fix wrong intent being passed in PhoneWindowManager.
 2015-03-19 21:37:45 +00:00
Bryce Lee
b45d3926f3 am 8320cf2d: Merge "Fix wrong intent being passed in PhoneWindowManager." into lmp-mr1-modular-dev 
* commit '8320cf2de357265179c3007256394b0cbb69d949':
  Fix wrong intent being passed in PhoneWindowManager.
 2015-03-19 21:30:43 +00:00
Yang Ni
c077ee316e Merge "Added copyright notice and formatted to convention" 2015-03-19 21:28:13 +00:00
Bryce Lee
8320cf2de3 Merge "Fix wrong intent being passed in PhoneWindowManager." into lmp-mr1-modular-dev 2015-03-19 21:24:52 +00:00
Bo Liu
17a7989904 Remove debug logging from WebView 
Moving them to chromium:
https://codereview.chromium.org/1022993002/

Change-Id: I6a9294b7041e9768397a624e5c174b22f4085e87
 2015-03-19 14:19:29 -07:00
Guang Zhu
8d09a7445e Merge "pass stream contents in separate thread for executeShellCommand" 2015-03-19 21:14:15 +00:00
Winson Chung
d0aa8a374f Fixing issue with screen-pinning for secondary users. 
- Proxy the screen pinning request to the SystemUI for the primary user.

Bug: 19395305
Change-Id: I6252d4ee05b2bea4e76b2a4d0b903e2866fffa76
 2015-03-19 14:11:27 -07:00
Joe Fernandez
d81e0056f5 am 33e84c16: am 8ca83e05: am 0362d6e0: am bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs 
* commit '33e84c167863745514b56b97c391f8d8913ca05e':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""
 2015-03-19 21:04:19 +00:00
Joe Fernandez
3c48647e4a am 58273493: am 1e81b070: am e41abf4a: am 43929db6: am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK re 
* commit '5827349328bd3f647c55ba271ec4f87e96a25ced':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
 2015-03-19 21:04:12 +00:00
Joe Fernandez
b032c39a8b am b89cdf1e: am 5c1a3ab4: am d7df900a: am a06c8ff0: am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs 
* commit 'b89cdf1ef452db6f21a94c8e122091b74833e3f3':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""
 2015-03-19 21:04:03 +00:00
Joe Fernandez
33e84c1678 am 8ca83e05: am 0362d6e0: am bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs 
* commit '8ca83e0504cb3b8d78c1a07bd49a73c58433671b':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""
 2015-03-19 20:56:45 +00:00
Joe Fernandez
5827349328 am 1e81b070: am e41abf4a: am 43929db6: am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" int 
* commit '1e81b070f772fdef45d7bedc0de0304603e05a95':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
 2015-03-19 20:56:33 +00:00
Joe Fernandez
b89cdf1ef4 am 5c1a3ab4: am d7df900a: am a06c8ff0: am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs 
* commit '5c1a3ab4216333696947eefee4d022f708e4c053':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""
 2015-03-19 20:56:25 +00:00
Miao Wang
815bcb24b0 am f8a69f56: am 2ef9955c: Merge "[RenderScript] Remove duplicate include in jni" 
* commit 'f8a69f562b7f1c987b5eddd2ee13c04c1a787625':
  [RenderScript] Remove duplicate include in jni
 2015-03-19 20:54:40 +00:00
Eric Gilmore
4496b0a539 am 3e90fa59: am 680f36a8: am 66e529aa: am 1f07cfb6: am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs 
* commit '3e90fa590857e43f0ed86eac18f0b02afca44b88':
  Changes for a quick, pre-migration bug sprint:
 2015-03-19 20:54:31 +00:00
Joe Fernandez
8ca83e0504 am 0362d6e0: am bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs 
* commit '0362d6e0c836cd48beb928f053d97dcc3961c110':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""
 2015-03-19 20:49:52 +00:00
Joe Fernandez
1e81b070f7 am e41abf4a: am 43929db6: am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs 
* commit 'e41abf4a304675bda37de7b796258f7f322d61ea':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
 2015-03-19 20:49:48 +00:00
Joe Fernandez
5c1a3ab421 am d7df900a: am a06c8ff0: am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs 
* commit 'd7df900a80f4c7af1f16efc0a8bcf044a2a7ff4d':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""
 2015-03-19 20:49:41 +00:00
Miao Wang
f8a69f562b am 2ef9955c: Merge "[RenderScript] Remove duplicate include in jni" 
* commit '2ef9955c827e0348a65b4f787e206925f4663197':
  [RenderScript] Remove duplicate include in jni
 2015-03-19 20:49:15 +00:00
Eric Gilmore
3e90fa5908 am 680f36a8: am 66e529aa: am 1f07cfb6: am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs 
* commit '680f36a88ff1c43e928066122505ec05c50d9942':
  Changes for a quick, pre-migration bug sprint:
 2015-03-19 20:46:28 +00:00
Joe Fernandez
0362d6e0c8 am bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs 
* commit 'bb777ef40d7a181e782dfce652c3d9da390dc9f5':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""
 2015-03-19 20:42:36 +00:00
Joe Fernandez
e41abf4a30 am 43929db6: am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs 
* commit '43929db6487f295c4bca1a499a5299da77ad2161':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
 2015-03-19 20:42:30 +00:00
Joe Fernandez
d7df900a80 am a06c8ff0: am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs 
* commit 'a06c8ff08ea783d4e0e3bdb1a46bf6a4a382a58c':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""
 2015-03-19 20:42:23 +00:00
Eric Gilmore
680f36a88f am 66e529aa: am 1f07cfb6: am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs 
* commit '66e529aa34034d044c496c330ba89026ee293253':
  Changes for a quick, pre-migration bug sprint:
 2015-03-19 20:38:49 +00:00
Miao Wang
2ef9955c82 Merge "[RenderScript] Remove duplicate include in jni" 2015-03-19 20:35:56 +00:00
Joe Fernandez
bb777ef40d am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs 
* commit 'b88bce219abf7fcad50ac105183bd79da0b9893c':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""
 2015-03-19 20:35:09 +00:00
Joe Fernandez
43929db648 am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs 
* commit 'f761e4c20ee63873043522990487ecd15bb18966':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
 2015-03-19 20:35:05 +00:00
Joe Fernandez
a06c8ff08e am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs 
* commit '36b2c1609d17317bb9d3977e46ada21275f54d65':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""
 2015-03-19 20:34:59 +00:00
Eric Gilmore
66e529aa34 am 1f07cfb6: am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs 
* commit '1f07cfb6011e3d30847f0e7012bcef9e93c0fa5f':
  Changes for a quick, pre-migration bug sprint:
 2015-03-19 20:32:03 +00:00
Joe Fernandez
b88bce219a am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs 
* commit 'c773358d599d9dd7716db88b0699a7903d64ad9b':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""
 2015-03-19 20:28:54 +00:00
Joe Fernandez
f761e4c20e am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs 
* commit 'd91167e8ceda64809e9afd73ac184dc319a276f5':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
 2015-03-19 20:28:45 +00:00
Joe Fernandez
36b2c1609d am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs 
* commit 'bacdd2b8dec83679493a95bdcfa5ac80b6cfcb78':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""
 2015-03-19 20:28:40 +00:00
Bryce Lee
9cd2e62612 Fix wrong intent being passed in PhoneWindowManager. 
When starting going home for Wear, the intent extra indicating the
intent is coming from a button press must be set. This was lost during
a merge conflict resolution.

Bug: 19832892
Change-Id: I6b77757b34f99dd754194448fdea9165690fc90f
 2015-03-19 13:27:26 -07:00
Eric Gilmore
1f07cfb601 am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs 
* commit '0fdeefbdad81e92a5fdb5acc7f92fc92a28654b4':
  Changes for a quick, pre-migration bug sprint:
 2015-03-19 20:24:57 +00:00