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

196538 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin Lee
a7bdb6c99b Merge "KeyChain: annotate with @WorkerThread" into mnc-dev 2015-07-03 16:48:15 +00:00
Lorenzo Colitti
71e3d079d6 Merge "Make the VPN notice connectivity changes on stacked interfaces." into mnc-dev 2015-07-03 02:37:46 +00:00
Svet Ganov
2799767886 Merge "Grant the default gallery app storage permissions" into mnc-dev 2015-07-02 21:37:58 +00:00
Svetoslav
212bd4280d Merge "Make granting default SMS and Phone permissions robust" into mnc-dev 2015-07-02 21:37:33 +00:00
Anthony Lee
930d6b07e3 Merge "Add capability to indicate a conference will never have children." into mnc-dev 2015-07-02 18:33:53 +00:00
Rubin Xu
b1f4cc647f Merge "Remove ExternalMediaFormatActivity" into mnc-dev 2015-07-02 16:22:46 +00:00
Rubin Xu
c85c639312 Remove ExternalMediaFormatActivity 
This activity is no longer used by any part of the framework.

Bug: 9433509
Change-Id: Iace394b7a11b75ed75b2eefc05990626a7e68ac2
 2015-07-02 16:53:57 +01:00
Alex Chau
be6307606e Merge "Clear "profile wiped" notification when a new porfile is created" into mnc-dev 2015-07-02 14:37:04 +00:00
Nicolas Prevot
2ee3beedb1 Merge "In NfcActivityManager, don't use UserHandle.CURRENT." into mnc-dev 2015-07-02 12:28:46 +00:00
Nicolas Prevot
60373e8060 Merge "Fix the case where an intent bounces several times between users." into mnc-dev 2015-07-02 10:27:58 +00:00
Lorenzo Colitti
1b60d11b8f Make the VPN notice connectivity changes on stacked interfaces. 
Currently, the VPN code only looks at base interfaces, so if
464xlat is in use, it will never disconnect when its underlying
network has disconnected. Use getAllInterfaceNames().contains()
instead of just comparing the base interface name.

Bug: 19336810
Change-Id: Id1ba2c80a09cec5098c6f512acdc0a05a939e9f3
 2015-07-02 13:03:03 +09:00
Svet Ganov
200d494b93 Grant the default gallery app storage permissions 
bug:22127986

Change-Id: I1ecd49d57d410bf10734fea4e0c92e6e5028d648
 2015-07-01 20:46:06 -07:00
Svetoslav
a5a0d94023 Make granting default SMS and Phone permissions robust 
The default dialer and sms apps are provided by the telecomm
stak which is brought up asynchronously as a service to which
the system binds. Hence, by the time we grant default permissions
this service is not bound and we do not know the default dialer
(accidentally the default SMS app is available before the service
is up). Now the default permission grant code is robust to handle
both cases of the default sms and phone apps being available
at grant time or asynchronously.

bug:22208642

Change-Id: I6385a0432368731aa9caea046d57eccbfb5abac0
 2015-07-01 20:00:32 -07:00
David Friedman
00f0716a95 am 2ebfc3f7: am fa8eb1e0: Merge "Docs: Localization of Design pages on DAC. Bug: 20503708" into mnc-preview-docs 
* commit '2ebfc3f78483842c789688da47b721f60b4149e4':
  Docs: Localization of Design pages on DAC. Bug: 20503708
 2015-07-02 02:45:30 +00:00
David Friedman
9ee2f2c90f am 5adc6ba0: am 7e4dc922: Merge "Docs: Fixes a terminology error in simplified Chinese on-boarding docs" into mnc-preview-docs 
* commit '5adc6ba056de056f73ee484b859b45657da0c1fb':
  Docs: Fixes a terminology error in simplified Chinese on-boarding docs
 2015-07-02 02:45:24 +00:00
David Friedman
2ebfc3f784 am fa8eb1e0: Merge "Docs: Localization of Design pages on DAC. Bug: 20503708" into mnc-preview-docs 
* commit 'fa8eb1e0d42e7b10447a285d9b2a583d367c3cad':
  Docs: Localization of Design pages on DAC. Bug: 20503708
 2015-07-02 02:33:03 +00:00
David Friedman
5adc6ba056 am 7e4dc922: Merge "Docs: Fixes a terminology error in simplified Chinese on-boarding docs" into mnc-preview-docs 
* commit '7e4dc922d949c7aec0a2a813e9487067e47e4c51':
  Docs: Fixes a terminology error in simplified Chinese on-boarding docs
 2015-07-02 02:32:59 +00:00
Abodunrinwa Toki
8fbe1a0cfc Merge "Add accessibility actions for the PROCESS_TEXT feature." into mnc-dev 2015-07-02 02:29:34 +00:00
David Friedman
fa8eb1e0d4 Merge "Docs: Localization of Design pages on DAC. Bug: 20503708" into mnc-preview-docs 2015-07-02 02:24:14 +00:00
David Friedman
7e4dc922d9 Merge "Docs: Fixes a terminology error in simplified Chinese on-boarding docs" into mnc-preview-docs 2015-07-02 02:23:55 +00:00
David Friedman
de81619dea Docs: Localization of Design pages on DAC. 
Bug: 20503708

Change-Id: Id3a4f5900d99125a1475d939d43444f46555018c
 2015-07-01 19:21:09 -07:00
Wale Ogunwale
b29d573dda am b85962df: am e155eef4: am 2735ac71: am 22cd16a0: am bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev 
* commit 'b85962df1ee6be2bba4c26fbd0964ade2c73a9c9':
  Prevent system uid component from running in an app process
 2015-07-02 02:14:44 +00:00
Wale Ogunwale
b85962df1e am e155eef4: am 2735ac71: am 22cd16a0: am bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev 
* commit 'e155eef4881c1ec8063a62619fe29aa6e8074b71':
  Prevent system uid component from running in an app process
 2015-07-02 01:36:17 +00:00
Wale Ogunwale
e155eef488 am 2735ac71: am 22cd16a0: am bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev 
* commit '2735ac71e6d8d1c00b95104057ac9365abb485d9':
  Prevent system uid component from running in an app process
 2015-07-02 01:22:06 +00:00
Wale Ogunwale
2735ac71e6 am 22cd16a0: am bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev 
* commit '22cd16a01f55149507c1d5d71c408987a71737fc':
  Prevent system uid component from running in an app process
 2015-07-02 01:07:44 +00:00
Wale Ogunwale
d9de45ad0e am 2adcfa1c: am 657d20ee: am 44000724: am 5278cea1: am d72dc762: am ec425a19: am df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev 
* commit '2adcfa1c02ecc695b86b8b11c1c4eb9891d4337e':
  Prevent system uid component from running in an app process
 2015-07-02 01:00:02 +00:00
Wale Ogunwale
2f8cac6b4c am 655b08c3: am b6f87997: am f54d1722: am 52034328: am 131e6b24: Merge "Prevent system uid component from running in an app process" into lmp-mr1-dev 
* commit '655b08c38a08d9adb35b75cf340d70068ba81204':
  Prevent system uid component from running in an app process
 2015-07-02 00:59:56 +00:00
Filip Gruszczynski
9f8e1f5d04 am aabc9869: am 03850591: Handle outsets when resized is called due to rotation. 
* commit 'aabc9869a95928660271b7022e2756fff2654013':
  Handle outsets when resized is called due to rotation.
 2015-07-02 00:59:48 +00:00
Wale Ogunwale
2adcfa1c02 am 657d20ee: am 44000724: am 5278cea1: am d72dc762: am ec425a19: am df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev 
* commit '657d20ee575f75beeb6a8419e07f3cb3960423fa':
  Prevent system uid component from running in an app process
 2015-07-02 00:52:35 +00:00
Wale Ogunwale
655b08c38a am b6f87997: am f54d1722: am 52034328: am 131e6b24: Merge "Prevent system uid component from running in an app process" into lmp-mr1-dev 
* commit 'b6f87997cb6ea557dc84e77c18c5bb22f99411fc':
  Prevent system uid component from running in an app process
 2015-07-02 00:52:29 +00:00
Wale Ogunwale
22cd16a01f am bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev 
* commit 'bc4743ebe845958fab8bbb0d0a425d55ece3d205':
  Prevent system uid component from running in an app process
 2015-07-02 00:50:52 +00:00
Filip Gruszczynski
aabc9869a9 am 03850591: Handle outsets when resized is called due to rotation. 
* commit '03850591954faf5280fd581dd04cd6958eda0124':
  Handle outsets when resized is called due to rotation.
 2015-07-02 00:47:48 +00:00
David Friedman
fcf9eb7614 am 429b9afd: am 0de59080: Merge "Docs: Fixes metadata that was getting mangled in jd_lists_unified file." into mnc-preview-docs 
* commit '429b9afd8f1a6a230754cb8567927c3cf4843931':
  Docs: Fixes metadata that was getting mangled in jd_lists_unified file.
 2015-07-02 00:47:24 +00:00
David Friedman
0d3a0f1b8a am c5764868: am e562bb6b: Merge "Docs: Localizations of Android dev on-boarding training docs. Bug: 20503574" into mnc-preview-docs 
* commit 'c5764868bdeef4a944317885b000db50e4092db5':
  Docs: Localizations of Android dev on-boarding training docs. Bug: 20503574
 2015-07-02 00:47:18 +00:00
David Friedman
6da7931e47 am 5320bccf: am 16add46c: Docs: Adding localized TOC for Preview docs. 
* commit '5320bccfaba7861b4a2c18d2109575e6b4029a49':
  Docs: Adding localized TOC for Preview docs.
 2015-07-02 00:47:12 +00:00
David Friedman
429b9afd8f am 0de59080: Merge "Docs: Fixes metadata that was getting mangled in jd_lists_unified file." into mnc-preview-docs 
* commit '0de590809590a144e4eeb1f36366109db7bcd89f':
  Docs: Fixes metadata that was getting mangled in jd_lists_unified file.
 2015-07-02 00:37:26 +00:00
David Friedman
c5764868bd am e562bb6b: Merge "Docs: Localizations of Android dev on-boarding training docs. Bug: 20503574" into mnc-preview-docs 
* commit 'e562bb6bc8da9bbbc8415db040de2bc0dc166168':
  Docs: Localizations of Android dev on-boarding training docs. Bug: 20503574
 2015-07-02 00:37:21 +00:00
David Friedman
5320bccfab am 16add46c: Docs: Adding localized TOC for Preview docs. 
* commit '16add46c5c4575ae28af9ef421eee0a76b07fa77':
  Docs: Adding localized TOC for Preview docs.
 2015-07-02 00:37:17 +00:00
Wale Ogunwale
bc4743ebe8 am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev 
* commit '7ab264abc214b7e1b7fff9934814020cea5f18fa':
  Prevent system uid component from running in an app process
 2015-07-02 00:37:02 +00:00
Wale Ogunwale
657d20ee57 am 44000724: am 5278cea1: am d72dc762: am ec425a19: am df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev 
* commit '44000724ef630182579004939d0c064664d9d3f2':
  Prevent system uid component from running in an app process
 2015-07-02 00:35:51 +00:00
Wale Ogunwale
b6f87997cb am f54d1722: am 52034328: am 131e6b24: Merge "Prevent system uid component from running in an app process" into lmp-mr1-dev 
* commit 'f54d17224bada1d852ba7c9d4bb9e2a792c0093b':
  Prevent system uid component from running in an app process
 2015-07-02 00:35:47 +00:00
Robert Schaub
e4c7c51dc8 am bf0fd65c: am 9131f97f: Merge "docs: Added warning to not use Android Key when API key is required" into mnc-preview-docs 
* commit 'bf0fd65ca0ba800f65aa9a70219abc3b37d5f6ec':
  docs: Added warning to not use Android Key when API key is required
 2015-07-02 00:13:00 +00:00
Jeff Sharkey
a5ed2c4dd3 Merge "Better handling of trim/benchmark results." into mnc-dev 2015-07-02 00:09:16 +00:00
Rich Slogar
755cc17aff Merge "Merge commit '88c0af88' into mnc-dev..." into mnc-dev 2015-07-02 00:03:55 +00:00
Rich Slogar
1b0120f901 Merge commit '88c0af88' into mnc-dev... 
Change-Id: Ib5a797e9a54ab1d447d84a57a209b32c4839b8c3
 2015-07-01 17:01:00 -07:00
Svet Ganov
68ffcf883c Merge "Teach receivers, activities, providers, and services app ops." into mnc-dev 2015-07-01 23:59:21 +00:00
Svet Ganov
4b2698ba5e Merge "Workaround legacy TelephonyManager.getDefault() with no context" into mnc-dev 2015-07-01 23:58:46 +00:00
David Friedman
a8acdbd13c Docs: Fixes a terminology error in simplified Chinese on-boarding docs 
Change-Id: Ib0ba3d449e78a0a69c0f704399b3865380bfcc8f
 2015-07-01 16:52:37 -07:00
John Reck
f70a5a78bb Merge "Set go-faster arguments" into mnc-dev 2015-07-01 23:52:20 +00:00
Svet Ganov
99b6043dad Teach receivers, activities, providers, and services app ops. 
Perform app op check in addition to the permisison check for all four
paltform components - activities, content providers, broadcast receivers,
services - if they are guarded by a permssion that has an associated app
op. This ensures that legacy apps will behave correctly if the permission
of the caller has been revoked, i.e. the app op for that permission was
disabled.

bug:22199666

Change-Id: Ia22d1c38d58b3cd6aabdc655cb7c7bddd85da7a2
 2015-07-01 16:20:00 -07:00