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

185842 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Joe Fernandez
c773358d59 am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs 
* commit 'dd461b298834d7582a98a69c164fe1e3b63c81b9':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""
 2015-03-19 20:21:47 +00:00
Joe Fernandez
d91167e8ce 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 '80f947c8b41d732bc1f8ca4c36df11a395dc9248':
  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:21:43 +00:00
Joe Fernandez
bacdd2b8de 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 'ef7d80811d16462d3cbd9af2319555aa5b6e1f52':
  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:21:37 +00:00
Rich Slogar
c259ba0390 am a29a34b0: am efa9bfac: am e3d92a20: am 983dd1a9: am b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs 
* commit 'a29a34b0540a895c75f6d516ec4cc9860be6253d':
  docs: proguard help update
 2015-03-19 20:17:37 +00:00
Eric Gilmore
0fdeefbdad am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs 
* commit 'cf1586d3fb4e3232aa4f4679eb389bcf89415b15':
  Changes for a quick, pre-migration bug sprint:
 2015-03-19 20:17:22 +00:00
Joe Fernandez
dd461b2988 Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs 2015-03-19 20:16:32 +00:00
Joe Fernandez
80f947c8b4 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 2015-03-19 20:16:21 +00:00
Joe Fernandez
ef7d80811d 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 2015-03-19 20:16:05 +00:00
Rich Slogar
a29a34b054 am efa9bfac: am e3d92a20: am 983dd1a9: am b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs 
* commit 'efa9bfac1aaa558ed6856581c424d6ffc507b0b1':
  docs: proguard help update
 2015-03-19 20:11:09 +00:00
Eric Gilmore
cf1586d3fb am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs 
* commit 'e43a64e3336548094571885944afc28792e24fa0':
  Changes for a quick, pre-migration bug sprint:
 2015-03-19 20:10:55 +00:00
Eric Gilmore
e43a64e333 Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs 2015-03-19 20:05:50 +00:00
Rich Slogar
efa9bfac1a am e3d92a20: am 983dd1a9: am b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs 
* commit 'e3d92a205b5c1bfde3ceff1fe4ca9a62cc5cb4fc':
  docs: proguard help update
 2015-03-19 20:02:31 +00:00
Rich Slogar
e3d92a205b am 983dd1a9: am b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs 
* commit '983dd1a9d1dc5a6d0bc72fcbc87b5194df09c048':
  docs: proguard help update
 2015-03-19 19:54:30 +00:00
Rich Slogar
983dd1a9d1 am b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs 
* commit 'b569ec3cc1366e3e3caa96fa40a9fc14ed9c6121':
  docs: proguard help update
 2015-03-19 19:47:03 +00:00
Rich Slogar
b569ec3cc1 am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs 
* commit 'd76aa14cf401ca794b585b2312528121c651a537':
  docs: proguard help update
 2015-03-19 19:39:27 +00:00
Rich Slogar
d76aa14cf4 am d5885842: Merge "docs: proguard help update" into lmp-docs 
* commit 'd58858427e102bec7ebe1d2a8ce418529924a68c':
  docs: proguard help update
 2015-03-19 19:10:06 +00:00
Rich Slogar
d58858427e Merge "docs: proguard help update" into lmp-docs 2015-03-19 19:04:05 +00:00
Jason Sams
db8cfd062e am d8e891f4: am f75e4ca3: Merge "Make it harder to leak contexts" 
* commit 'd8e891f474096c310f60ca6d2f737cdc0251003e':
  Make it harder to leak contexts
 2015-03-19 18:59:00 +00:00
Jason Sams
d8e891f474 am f75e4ca3: Merge "Make it harder to leak contexts" 
* commit 'f75e4ca3945f4c299dc26f4c95d8d18ec74f41bb':
  Make it harder to leak contexts
 2015-03-19 18:52:47 +00:00
Andres Morales
2566dbde3f am e39ab2ae: am f342e5e0: am ca0391eb: am c8f952ce: Write correct checksum when formatting partition 
* commit 'e39ab2ae9c844d9f553f7214b5f80856b9389311':
  Write correct checksum when formatting partition
 2015-03-19 18:47:52 +00:00
Andres Morales
e39ab2ae9c am f342e5e0: am ca0391eb: am c8f952ce: Write correct checksum when formatting partition 
* commit 'f342e5e0ae85fa7929e9b2eb4213bbc85dbcf61c':
  Write correct checksum when formatting partition
 2015-03-19 18:41:31 +00:00
Jason Sams
f75e4ca394 Merge "Make it harder to leak contexts" 2015-03-19 18:38:16 +00:00
Andres Morales
f342e5e0ae am ca0391eb: am c8f952ce: Write correct checksum when formatting partition 
* commit 'ca0391eb524b0adad79160c48682c4edf6f49ed2':
  Write correct checksum when formatting partition
 2015-03-19 18:35:07 +00:00
Andres Morales
ca0391eb52 am c8f952ce: Write correct checksum when formatting partition 
* commit 'c8f952ce9f9cadc0d38745e455c0a6388bc68a47':
  Write correct checksum when formatting partition
 2015-03-19 18:27:54 +00:00
Elliott Hughes
644cb09275 am 0634fba5: am 89da4ca6: Merge "Remove unused printapk.cpp." 
* commit '0634fba5915073e5b46e24f0ba0d5bbc44c922a5':
  Remove unused printapk.cpp.
 2015-03-19 18:27:04 +00:00
Elliott Hughes
0634fba591 am 89da4ca6: Merge "Remove unused printapk.cpp." 
* commit '89da4ca67d5bf6c35ea76f074cb2caa3d542740e':
  Remove unused printapk.cpp.
 2015-03-19 18:19:54 +00:00
Dianne Hackborn
8ad2af7e5b First stab at device idle mode. 
Introduce a new device idle controller service that
monitor's the device state and determines when to go
in to idle mode.  When in idle mode, all we do right
now is turn off network access the same as we do for
power save mode.  Many more things should come in the
future -- stopping the alarm manager from scheduling
(most) alarms, telling GmsCore for it to stop doing
stuff, etc.

Battery stats now has state tracking for devie idle
mode, as well as events for the reasons we can come
out of idle mode (significant motion or the device
becoming active).  Also added new events noting when
packages are installed.

Renamed the "low power" event in battery stats to
"power save" because the former was just way too
confusing.

Finally, fix buffer size reading kernel wake locks.
(Stupidly, just increasing the buffer size.  Ideally
we should try to be smarter and grow our buffer to
fit the data available, but I'll leave that for
another time.)

Change-Id: I0be2062466c83ee9d890c6cf5a228d9cc4090eca
 2015-03-19 11:10:55 -07:00
Elliott Hughes
89da4ca67d Merge "Remove unused printapk.cpp." 2015-03-19 18:06:17 +00:00
Rich Slogar
f062b94cc2 docs: proguard help update 
b/19383794
b/19417644

Change-Id: I454015fb85601dbd31d3cb364eaa6d0adee0c764
 2015-03-19 10:55:27 -07:00
Alex Klyubin
f9034cc4ae Add android.security.NetworkSecurityPolicy. 
The initial purpose of the NetworkSecurityPolicy class is to provide a
way for network libraries to check whether cleartext network traffic
(e.g., HTTP, WebSockets, XMPP, IMAP, SMTP) should be blocked from this
process.

The policy is set declaratively by the app developer in the app's
manifest and can be queried from ApplicationInfo.flags. Unfortunately,
several network stacks (bundled and unbundled) do not have a reference
to ApplicationInfo or Context.

Alternatives:
* Keep this API hidden (and thus potentially move it from framework to
  libcore), thus precluding unbundled HTTP stacks from using the API.
* Introduce a new java.lang.System property instead of this API.
  However, such properties are a mess and not as powerful/extensible
  as a public class.

Bug: 19215516
Change-Id: If22056a74d257bf1d805ebb4fc284240b3d338f1
 2015-03-19 10:27:48 -07:00
Yin-Chia Yeh
3816e4a73a Merge "Camera: update createStream API to add new rotation field" 2015-03-19 17:27:39 +00:00
Eric Laurent
f09d4bd388 Merge "fix return from finally" 2015-03-19 17:20:26 +00:00
Andres Morales
c8f952ce9f Write correct checksum when formatting partition 
OEM unlock enabled bit is not computed in the checksum,
causing OEM Unlocking to be disabled after the second
reboot.

Bug: 19829441
Change-Id: I100bf5d3958b89323ee35b9e97b19c162209fcd7
 2015-03-19 17:18:01 +00:00
Mike Lockwood
ac9e2d756e Merge "MidiDeviceInfo: Add constants for future Bluetooth MIDI support" 2015-03-19 17:10:17 +00:00
Mathieu Chartier
543a3578ad am 05844d57: am b7d997a7: Merge "Revert "Change jit properties to be debug properties"" 
* commit '05844d573f33c77cd7bb608a118a998506a6996d':
  Revert "Change jit properties to be debug properties"
 2015-03-19 17:06:43 +00:00
Chris Craik
8144923714 Merge "Fix clang build" 2015-03-19 17:01:44 +00:00
Chris Craik
c6128bae43 Fix clang build 
Change-Id: I5336ac347123671a18401121c5f001c8f7caf54d
 2015-03-19 10:00:56 -07:00
Mathieu Chartier
05844d573f am b7d997a7: Merge "Revert "Change jit properties to be debug properties"" 
* commit 'b7d997a7b79c233869fdd5ad18b013caad4a7236':
  Revert "Change jit properties to be debug properties"
 2015-03-19 16:58:59 +00:00
Mathieu Chartier
b7d997a7b7 Merge "Revert "Change jit properties to be debug properties"" 2015-03-19 16:44:59 +00:00
Alex Klyubin
160a253d48 am d71f548f: am 4177b8cb: Merge "Add app-level usesCleartextTraffic manifest attribute." 
* commit 'd71f548f4803f0696af7de9a2989673cfd83800f':
  Add app-level usesCleartextTraffic manifest attribute.
 2015-03-19 16:43:52 +00:00
Joe Fernandez
b8eea908c6 RESUBMIT: "Doc change: add docs for SafetyNet API."" 
This reverts commit 1fac8d4800c4cdd0c357b17ad0a271f8f3b4bee0.

Change-Id: Idf3dba195f3e0ccf27103b9f7d7a67cec8c917b0
 2015-03-19 16:39:43 +00:00
Joe Fernandez
61bfeafdef 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."" 
This reverts commit 2a867108951807e467dbfe0fcd4cc48a4d7f4191.

Change-Id: Ib91bf437e952e8a91f20afc63332b88952527ca4
 2015-03-19 16:38:05 +00:00
Joe Fernandez
7786917f4a RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."" 
This reverts commit c0e9ac455568b2d82d191388708a281bdb376cc9.

Change-Id: Iccc75ead90c92602b25da70e13bcdd55a6d129b6
 2015-03-19 16:36:02 +00:00
Yorke Lee
e9d827aa51 Merge "Make PhoneAccount.CAPABILITY_VIDEO_CALLING public" 2015-03-19 16:30:36 +00:00
Yorke Lee
04ed503e7b Make PhoneAccount.CAPABILITY_VIDEO_CALLING public 
Bug: 19824779
Change-Id: If38606d62bffbb7b794f530f3fcc09b6e5123b55
 2015-03-19 09:23:43 -07:00